move residue() to the calculus module

diofant · Dec 28, 2022 · 4dd9b2a · 4dd9b2a
1 parent ca5b73e
commit 4dd9b2a
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 10 deletions.
diff --git a/diofant/__init__.py b/diofant/__init__.py
@@ -55,7 +55,7 @@
                       IntegerRing, PythonRational, QQ_gmpy, QQ_python,
                       RationalField, RealAlgebraicField, RealField, ZZ_gmpy,
                       ZZ_python, IntegerModRing)
-from .series import Limit, O, Order, limit, residue
+from .series import Limit, O, Order, limit
 from .functions import (E1, Abs, Chi, Ci, DiracDelta, Ei, Eijk,
                         FallingFactorial, Heaviside, Id, KroneckerDelta,
                         LambertW, LeviCivita, Li, Max, Min, Piecewise,
@@ -150,7 +150,7 @@
                      SparseNDimArray, derive_by_array,
                      get_contraction_structure, get_indices, permutedims,
                      tensorcontraction, tensorproduct)
-from .calculus import maximize, minimize
+from .calculus import maximize, minimize, residue
 from .combinatorics import (AbelianGroup, AlternatingGroup, Cycle, CyclicGroup,
                             DihedralGroup, DirectProduct, GrayCode,
                             IntegerPartition, Partition, Permutation,

diff --git a/diofant/calculus/__init__.py b/diofant/calculus/__init__.py
@@ -3,6 +3,7 @@
 """
 
 from .optimization import maximize, minimize
+from .residues import residue
 
 
-__all__ = 'maximize', 'minimize'
+__all__ = 'maximize', 'minimize', 'residue'
diff --git a/diofant/series/residues.py → diofant/calculus/residues.py b/diofant/series/residues.py → diofant/calculus/residues.py
@@ -1,5 +1,5 @@
 from ..core import Integer, Mul, sympify
-from .order import Order
+from ..series import Order
 
 
 def residue(expr, x, x0):

diff --git a/diofant/series/__init__.py b/diofant/series/__init__.py
@@ -2,7 +2,6 @@
 """
 from .limits import Limit, limit
 from .order import O, Order
-from .residues import residue
 
 
-__all__ = 'Limit', 'O', 'Order', 'limit', 'residue'
+__all__ = 'Limit', 'O', 'Order', 'limit'
diff --git a/diofant/simplify/hyperexpand.py b/diofant/simplify/hyperexpand.py
@@ -78,7 +78,6 @@
                                        HyperRep_sqrts2, hyper, meijerg)
 from ..polys import Poly, cancel
 from ..printing import sstr
-from ..series import residue
 from ..utilities import default_sort_key, sift
 from .powsimp import powdenest
 from .simplify import simplify
@@ -2240,6 +2239,8 @@ def can_do(pbm, pap):
         return True
 
     def do_slater(an, bm, ap, bq, z, zfinal):
+        from ..calculus import residue
+
         # zfinal is the value that will eventually be substituted for z.
         # We pass it to _hyperexpand to improve performance.
         func = G_Function(an, bm, ap, bq)

diff --git a/diofant/tests/series/test_residues.py → diofant/tests/calculus/test_residues.py b/diofant/tests/series/test_residues.py → diofant/tests/calculus/test_residues.py
diff --git a/docs/modules/calculus/index.rst b/docs/modules/calculus/index.rst
@@ -9,3 +9,7 @@ Calculus
 
 .. automodule:: diofant.calculus.optimization
     :members:
+
+.. automodule:: diofant.calculus.residues
+   :members:
+
diff --git a/docs/modules/series.rst b/docs/modules/series.rst
@@ -9,6 +9,3 @@ function and many related functions.
 
 .. automodule:: diofant.series.order
    :members:
-
-.. automodule:: diofant.series.residues
-   :members: