move Order() and O() to the calculus module

diofant/__init__.py

@@ -1,10 +1,23 @@
 """Diofant is a Python library for symbolic mathematics."""
 
 from fractions import Fraction
+
 import pkg_resources
+
+
 __version__ = pkg_resources.get_distribution(__name__).version
 del pkg_resources
 
+from .calculus import O, Order, maximize, minimize, residue
+from .combinatorics import (AbelianGroup, AlternatingGroup, Cycle, CyclicGroup,
+                            DihedralGroup, DirectProduct, GrayCode,
+                            IntegerPartition, Partition, Permutation,
+                            PermutationGroup, Polyhedron, Prufer, RGS_enum,
+                            RGS_rank, RGS_unrank, RubikGroup, Subset,
+                            SymmetricGroup, alternating, cube, cyclic,
+                            dihedral, dodecahedron, icosahedron, octahedron,
+                            symmetric, tetrahedron)
+from .concrete import Product, Sum, product, summation
 from .core import (Add, Atom, AtomicExpr, Basic, Catalan, Derivative, Dict,
                    Dummy, E, Eq, Equality, EulerGamma, Expr, Float, Function,
                    FunctionClass, Ge, GoldenRatio, GreaterThan, Gt, I, Integer,
@@ -19,43 +32,12 @@
                    integer_digits, integer_nthroot, mod_inverse, nan, nfloat,
                    oo, pi, preorder_traversal, symbols, sympify, var,
                    vectorize, zoo)
-from .logic import (ITE, And, Equivalent, Implies, Nand, Nor, Not, Or,
-                    Xor, false, satisfiable, simplify_logic, to_cnf,
-                    to_dnf, to_nnf, true)
-from .polys import (LC, LM, LT, BasePolynomialError, CoercionFailed,
-                    ComputationFailed, DomainError, EvaluationFailed,
-                    ExactQuotientFailed, ExtraneousFactors, FlagError,
-                    FractionField, GeneratorsError, GeneratorsNeeded,
-                    GroebnerBasis, HeuristicGCDFailed, HomomorphismFailed,
-                    IsomorphismFailed, Monomial, MultivariatePolynomialError,
-                    NotAlgebraic, NotInvertible, NotReversible,
-                    OperationNotSupported, OptionError, Options,
-                    PolificationFailed, Poly, PolynomialDivisionFailed,
-                    PolynomialError, PolynomialRing, PurePoly,
-                    RefinementFailed, RootOf, RootSum, UnificationFailed,
-                    UnivariatePolynomialError, UnivarPolynomialRing, apart,
-                    apart_list, assemble_partfrac_list, cancel,
-                    chebyshevt_poly, chebyshevu_poly, cofactors, compose,
-                    construct_domain, content, count_roots, cyclotomic_poly,
-                    decompose, degree, discriminant, div, exquo,
-                    factor, factor_list, field, field_isomorphism, gcd,
-                    gcdex, grevlex, grlex, groebner, half_gcdex,
-                    hermite_poly, horner, igrevlex, igrlex, ilex, interpolate,
-                    interpolating_poly, invert, itermonomials, jacobi_poly,
-                    laguerre_poly, lcm, legendre_poly, lex,
-                    minimal_polynomial, monic, nroots, parallel_poly_from_expr,
-                    primitive, primitive_element, quo, random_poly,
-                    real_roots, reduced, rem, resultant, ring, roots,
-                    spherical_bessel_fn, sqf, sqf_list, sqf_norm, sqf_part,
-                    subresultants, swinnerton_dyer_poly, symmetric_poly,
-                    symmetrize, terms_gcd, together, trunc, viete)
 from .domains import (CC, EX, FF, GF, GROUND_TYPES, QQ, RR, ZZ, AlgebraicField,
                       ComplexAlgebraicField, ComplexField, Domain,
                       ExpressionDomain, FF_gmpy, FF_python, FiniteField,
-                      IntegerRing, PythonRational, QQ_gmpy, QQ_python,
-                      RationalField, RealAlgebraicField, RealField, ZZ_gmpy,
-                      ZZ_python, IntegerModRing)
-from .series import Limit, O, Order, limit
+                      IntegerModRing, IntegerRing, PythonRational, QQ_gmpy,
+                      QQ_python, RationalField, RealAlgebraicField, RealField,
+                      ZZ_gmpy, ZZ_python)
 from .functions import (E1, Abs, Chi, Ci, DiracDelta, Ei, Eijk,
                         FallingFactorial, Heaviside, Id, KroneckerDelta,
                         LambertW, LeviCivita, Li, Max, Min, Piecewise,
@@ -81,6 +63,40 @@
                         real_root, rf, root, sec, sech, sign, sin, sinh, sqrt,
                         subfactorial, tan, tanh, transpose, trigamma,
                         unbranched_argument, unpolarify, uppergamma, yn, zeta)
+from .geometry import (Circle, Curve, Ellipse, GeometryError, Line, Point,
+                       Polygon, Ray, RegularPolygon, Segment, Triangle,
+                       are_similar, centroid, convex_hull, deg, idiff,
+                       intersection, rad)
+from .integrals import (CosineTransform, FourierTransform, HankelTransform,
+                        Integral, InverseCosineTransform,
+                        InverseFourierTransform, InverseHankelTransform,
+                        InverseLaplaceTransform, InverseMellinTransform,
+                        InverseSineTransform, LaplaceTransform,
+                        MellinTransform, SineTransform, cosine_transform,
+                        fourier_transform, hankel_transform, integrate,
+                        inverse_cosine_transform, inverse_fourier_transform,
+                        inverse_hankel_transform, inverse_laplace_transform,
+                        inverse_mellin_transform, inverse_sine_transform,
+                        laplace_transform, line_integrate, mellin_transform,
+                        sine_transform)
+from .interactive import init_printing
+from .logic import (ITE, And, Equivalent, Implies, Nand, Nor, Not, Or, Xor,
+                    false, satisfiable, simplify_logic, to_cnf, to_dnf, to_nnf,
+                    true)
+from .matrices import (Adjoint, BlockDiagMatrix, BlockMatrix, Determinant,
+                       DiagonalMatrix, DiagonalOf, FunctionMatrix, GramSchmidt,
+                       HadamardProduct, Identity, ImmutableDenseMatrix,
+                       ImmutableMatrix, ImmutableSparseMatrix, Inverse, MatAdd,
+                       MatMul, MatPow, Matrix, MatrixBase, MatrixExpr,
+                       MatrixSlice, MatrixSymbol, MutableDenseMatrix,
+                       MutableMatrix, MutableSparseMatrix,
+                       NonSquareMatrixError, ShapeError, SparseMatrix, Trace,
+                       Transpose, ZeroMatrix, block_collapse, blockcut,
+                       casoratian, det, diag, eye, hadamard_product, hessian,
+                       jordan_cell, list2numpy, matrix2numpy,
+                       matrix_multiply_elementwise, ones, randMatrix,
+                       rot_axis1, rot_axis2, rot_axis3, symarray, trace,
+                       vandermonde, wronskian, zeros)
 from .ntheory import (Sieve, binomial_coefficients, binomial_coefficients_list,
                       continued_fraction_convergents,
                       continued_fraction_iterator, continued_fraction_periodic,
@@ -95,78 +111,64 @@
                       primepi, primerange, primitive_root, primorial,
                       quadratic_residues, randprime, sieve, sqrt_mod,
                       sqrt_mod_iter, square_factor, totient, trailing)
-from .concrete import Product, Sum, product, summation
+from .plotting import (plot, plot3d, plot3d_parametric_line,
+                       plot3d_parametric_surface, plot_backends, plot_implicit,
+                       plot_parametric)
+from .polys import (LC, LM, LT, BasePolynomialError, CoercionFailed,
+                    ComputationFailed, DomainError, EvaluationFailed,
+                    ExactQuotientFailed, ExtraneousFactors, FlagError,
+                    FractionField, GeneratorsError, GeneratorsNeeded,
+                    GroebnerBasis, HeuristicGCDFailed, HomomorphismFailed,
+                    IsomorphismFailed, Monomial, MultivariatePolynomialError,
+                    NotAlgebraic, NotInvertible, NotReversible,
+                    OperationNotSupported, OptionError, Options,
+                    PolificationFailed, Poly, PolynomialDivisionFailed,
+                    PolynomialError, PolynomialRing, PurePoly,
+                    RefinementFailed, RootOf, RootSum, UnificationFailed,
+                    UnivariatePolynomialError, UnivarPolynomialRing, apart,
+                    apart_list, assemble_partfrac_list, cancel,
+                    chebyshevt_poly, chebyshevu_poly, cofactors, compose,
+                    construct_domain, content, count_roots, cyclotomic_poly,
+                    decompose, degree, discriminant, div, exquo, factor,
+                    factor_list, field, field_isomorphism, gcd, gcdex, grevlex,
+                    grlex, groebner, half_gcdex, hermite_poly, horner,
+                    igrevlex, igrlex, ilex, interpolate, interpolating_poly,
+                    invert, itermonomials, jacobi_poly, laguerre_poly, lcm,
+                    legendre_poly, lex, minimal_polynomial, monic, nroots,
+                    parallel_poly_from_expr, primitive, primitive_element, quo,
+                    random_poly, real_roots, reduced, rem, resultant, ring,
+                    roots, spherical_bessel_fn, sqf, sqf_list, sqf_norm,
+                    sqf_part, subresultants, swinnerton_dyer_poly,
+                    symmetric_poly, symmetrize, terms_gcd, together, trunc,
+                    viete)
+from .printing import (StrPrinter, ccode, dotprint, fcode, latex,
+                       mathematica_code, mathml, octave_code, pprint,
+                       pprint_use_unicode, pretty, pretty_print, python, srepr,
+                       sstr, sstrrepr)
+from .series import Limit, limit
+from .sets import (Complement, Contains, EmptySet, ExtendedReals, FiniteSet,
+                   ImageSet, Integers, Intersection, Interval, Naturals,
+                   Naturals0, ProductSet, Range, Rationals, Reals, Set,
+                   SymmetricDifference, Union, imageset)
 from .simplify import (FU, EPath, besselsimp, bottom_up, collect,
                        collect_const, combsimp, cse, denom, epath, exptrigsimp,
                        fraction, fu, hyperexpand, hypersimilar, hypersimp,
                        logcombine, nsimplify, numer, posify, powdenest,
                        powsimp, radsimp, ratsimp, ratsimpmodprime, rcollect,
                        separatevars, signsimp, simplify, sqrtdenest, trigsimp,
                        use)
-from .sets import (Complement, Contains, EmptySet, FiniteSet, ImageSet,
-                   Integers, Intersection, Interval, Naturals, Naturals0,
-                   ProductSet, Range, Rationals, Reals, Set,
-                   SymmetricDifference, Union, imageset, ExtendedReals)
 from .solvers import dsolve, reduce_inequalities, rsolve, solve
-from .matrices import (Adjoint, BlockDiagMatrix, BlockMatrix, Determinant,
-                       DiagonalMatrix, DiagonalOf, FunctionMatrix, GramSchmidt,
-                       HadamardProduct, Identity, ImmutableDenseMatrix,
-                       ImmutableMatrix, ImmutableSparseMatrix, Inverse, MatAdd,
-                       MatMul, MatPow, Matrix, MatrixBase, MatrixExpr,
-                       MatrixSlice, MatrixSymbol, MutableDenseMatrix,
-                       MutableMatrix, MutableSparseMatrix,
-                       NonSquareMatrixError, ShapeError, SparseMatrix, Trace,
-                       Transpose, ZeroMatrix, block_collapse, blockcut,
-                       casoratian, det, diag, eye, hadamard_product, hessian,
-                       jordan_cell, list2numpy, matrix2numpy,
-                       matrix_multiply_elementwise, ones, randMatrix,
-                       rot_axis1, rot_axis2, rot_axis3, symarray, trace,
-                       vandermonde, wronskian, zeros)
-from .geometry import (Circle, Curve, Ellipse, GeometryError, Line,
-                       Point, Polygon, Ray,
-                       RegularPolygon, Segment, Triangle,
-                       are_similar, centroid, convex_hull, deg, idiff,
-                       intersection, rad)
-from .utilities import (cantor_product, capture, default_sort_key, filldedent,
-                        flatten, group, has_dups, has_variety, lambdify,
-                        numbered_symbols, ordered, postfixes,
-                        postorder_traversal, prefixes, sift, subsets,
-                        topological_sort, unflatten, variations)
-from .integrals import (CosineTransform, FourierTransform, HankelTransform,
-                        Integral, InverseCosineTransform,
-                        InverseFourierTransform, InverseHankelTransform,
-                        InverseLaplaceTransform, InverseMellinTransform,
-                        InverseSineTransform, LaplaceTransform,
-                        MellinTransform, SineTransform, cosine_transform,
-                        fourier_transform, hankel_transform, integrate,
-                        inverse_cosine_transform, inverse_fourier_transform,
-                        inverse_hankel_transform, inverse_laplace_transform,
-                        inverse_mellin_transform, inverse_sine_transform,
-                        laplace_transform, line_integrate, mellin_transform,
-                        sine_transform)
 from .tensor import (Array, DenseNDimArray, Idx, ImmutableDenseNDimArray,
                      ImmutableSparseNDimArray, Indexed, IndexedBase,
                      MutableDenseNDimArray, MutableSparseNDimArray, NDimArray,
                      SparseNDimArray, derive_by_array,
                      get_contraction_structure, get_indices, permutedims,
                      tensorcontraction, tensorproduct)
-from .calculus import maximize, minimize, residue
-from .combinatorics import (AbelianGroup, AlternatingGroup, Cycle, CyclicGroup,
-                            DihedralGroup, DirectProduct, GrayCode,
-                            IntegerPartition, Partition, Permutation,
-                            PermutationGroup, Polyhedron, Prufer, RGS_enum,
-                            RGS_rank, RGS_unrank, RubikGroup, Subset,
-                            SymmetricGroup, alternating, cube, cyclic,
-                            dihedral, dodecahedron, icosahedron, octahedron,
-                            symmetric, tetrahedron)
-from .plotting import (plot, plot3d, plot3d_parametric_line,
-                       plot3d_parametric_surface, plot_backends, plot_implicit,
-                       plot_parametric)
-from .printing import (StrPrinter, ccode, dotprint, fcode, latex,
-                       mathematica_code, mathml, octave_code, pprint,
-                       pprint_use_unicode, pretty, pretty_print, python, srepr,
-                       sstr, sstrrepr)
-from .interactive import init_printing
+from .utilities import (cantor_product, capture, default_sort_key, filldedent,
+                        flatten, group, has_dups, has_variety, lambdify,
+                        numbered_symbols, ordered, postfixes,
+                        postorder_traversal, prefixes, sift, subsets,
+                        topological_sort, unflatten, variations)
 
 
 __all__ = (

diofant/calculus/__init__.py

@@ -3,7 +3,8 @@
 """
 
 from .optimization import maximize, minimize
+from .order import O, Order
 from .residues import residue
 
 
-__all__ = 'maximize', 'minimize', 'residue'
+__all__ = 'O', 'Order', 'maximize', 'minimize', 'residue'

diofant/series/order.py → diofant/calculus/order.py

@@ -298,8 +298,8 @@ def contains(self, expr):
             relation cannot be determined.
 
         """
+        from ..series import Limit
         from ..simplify import powsimp
-        from .limits import Limit
         if expr == 0:
             return True
         if expr is nan:

diofant/calculus/residues.py

@@ -1,5 +1,5 @@
 from ..core import Integer, Mul, sympify
-from ..series import Order
+from .order import Order
 
 
 def residue(expr, x, x0):

diofant/core/add.py

@@ -33,7 +33,7 @@ def flatten(cls, seq):
         diofant.core.mul.Mul.flatten
 
         """
-        from ..series.order import Order
+        from ..calculus import Order
         from .mul import Mul
 
         rv = None
@@ -591,7 +591,7 @@ def extract_leading_order(self, symbols):
         ((x, O(x)),)
 
         """
-        from ..series import Order
+        from ..calculus import Order
         lst = []
         symbols = list(symbols if is_sequence(symbols) else [symbols])
         point = [0]*len(symbols)
@@ -635,7 +635,7 @@ def as_real_imag(self, deep=True, **hints):
         return self.func(*re_part), self.func(*im_part)
 
     def _eval_as_leading_term(self, x):
-        from ..series import Order
+        from ..calculus import Order
         from . import factor_terms
 
         by_O = functools.cmp_to_key(lambda f, g: 1 if Order(g, x).contains(f) is not False else -1)