Merge pull request sympy#26940 from smichr/heurisch

fixes permutation of types in heurisch

Author: oscarbenjamin

.github/workflows/runtests.yml

@@ -187,27 +187,27 @@ jobs:
       # Test modules with specific dependencies
       - run: bin/test_optional_dependencies.py
 
-  # -------------------- NumPy nightly ----------------------------- #
+  # -------------------- Bleeding edge dependencies ----------------- #
 
-  numpy-nightly:
+  bleeding-edge:
     needs: code-quality
-
-    runs-on: ubuntu-20.04
-
-    name: NumPy/SciPy nightly
-
+    name: Bleeding edge dependencies
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.12
-
-      - run: pip install -r requirements-dev.txt
+          python-version: '3.12'
+      - run: sudo apt-get update
+      - run: sudo apt-get install libgmp-dev libmpfr-dev libmpc-dev libflint-dev
+      - run: pip install git+https://github.com/flintlib/python-flint.git@master
+      - run: pip install git+https://github.com/aleaxit/gmpy.git@master
+      - run: pip install git+https://github.com/mpmath/mpmath.git@master
       - run: pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
       - run: pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple scipy
-
-      # Test modules with specific dependencies
-      - run: bin/test_optional_dependencies.py
+      - run: pip install -r requirements-dev.txt
+      - run: pip install .
+      - run: pytest -n auto
 
   # -------------------- FLINT tests -------------------------------- #
 

doc/src/modules/sets.rst

@@ -26,9 +26,6 @@ Elementary Sets
 Compound Sets
 -------------
 
-.. module:: sympy.sets.sets
-   :noindex:
-
 .. autoclass:: Union
    :members:
 

sympy/integrals/heurisch.py

@@ -504,15 +504,16 @@ def heurisch(f, x, rewrite=False, hints=None, mappings=None, retries=3,
         # optimizing the number of permutations of mapping              #
         assert mapping[-1][0] == x # if not, find it and correct this comment
         unnecessary_permutations = [mapping.pop(-1)]
-        # only permute types of objects and let the ordering
-        # of types take care of the order of replacement
+        # permute types of objects
         types = defaultdict(list)
         for i in mapping:
-            types[type(i)].append(i)
+            e, _ = i
+            types[type(e)].append(i)
         mapping = [types[i] for i in types]
         def _iter_mappings():
             for i in permutations(mapping):
-                yield [j for i in i for j in i]
+                # make the expression of a given type be ordered
+                yield [j for i in i for j in ordered(i)]
         mappings = _iter_mappings()
     else:
         unnecessary_permutations = unnecessary_permutations or []

sympy/integrals/tests/test_heurisch.py

@@ -19,6 +19,8 @@
 from sympy.integrals.heurisch import components, heurisch, heurisch_wrapper
 from sympy.testing.pytest import XFAIL, slow
 from sympy.integrals.integrals import integrate
+from sympy import S
+
 x, y, z, nu = symbols('x,y,z,nu')
 f = Function('f')
 
@@ -368,6 +370,8 @@ def test_heurisch_complex_erf_issue_26338():
 
     a = exp(-x**2/(2*(2 - I)**2))
     assert heurisch(a, x, hints=[]) is None  # None, not a wrong soln
+    a = exp(-r**2/(2*(2 - I)**2))
+    assert heurisch(a, r, hints=[]) is None
     a = sqrt(pi)*erf((1 + I)/2)/2
     assert integrate(exp(-I*x**2/2), (x, 0, 1)) == a - I*a
 
@@ -387,3 +391,29 @@ def test_issue_15498():
     integrand = m*m.subs(t, s)**-1*f_vec.subs(aif_eq.lhs, aif_eq.rhs).subs(t, s)
     solution = integrate(integrand[0], (s, 0, t))
     assert solution is not None  # does not hang and takes less than 10 s
+
+
+@slow
+def test_heurisch_issue_26930():
+    integrand = x**Rational(4, 3)*log(x)
+    anti = 3*x**(S(7)/3)*log(x)/7 - 9*x**(S(7)/3)/49
+    assert heurisch(integrand, x) == anti
+    assert integrate(integrand, x) == anti
+    assert integrate(integrand, (x, 0, 1)) == -S(9)/49
+
+
+def test_heurisch_issue_26922():
+
+    a, b, x = symbols("a, b, x", real=True, positive=True)
+    C = symbols("C", real=True)
+    i1 = -C*x*exp(-a*x**2 - sqrt(b)*x)
+    i2 = C*x*exp(-a*x**2 + sqrt(b)*x)
+    i = Integral(i1, x) + Integral(i2, x)
+    res = (
+        -C*exp(-a*x**2)*exp(sqrt(b)*x)/(2*a)
+        + C*exp(-a*x**2)*exp(-sqrt(b)*x)/(2*a)
+        + sqrt(pi)*C*sqrt(b)*exp(b/(4*a))*erf(sqrt(a)*x - sqrt(b)/(2*sqrt(a)))/(4*a**(S(3)/2))
+        + sqrt(pi)*C*sqrt(b)*exp(b/(4*a))*erf(sqrt(a)*x + sqrt(b)/(2*sqrt(a)))/(4*a**(S(3)/2))
+    )
+
+    assert i.doit(heurisch=False).expand() == res

sympy/integrals/tests/test_integrals.py

@@ -1146,8 +1146,8 @@ def test_issue_3940():
     a, b, c, d = symbols('a:d', positive=True)
     assert integrate(exp(-x**2 + I*c*x), x) == \
         -sqrt(pi)*exp(-c**2/4)*erf(I*c/2 - x)/2
-    assert integrate(exp(a*x**2 + b*x + c), x) == \
-        sqrt(pi)*exp(c - b**2/(4*a))*erfi((2*a*x + b)/(2*sqrt(a)))/(2*sqrt(a))
+    assert integrate(exp(a*x**2 + b*x + c), x).equals(
+        sqrt(pi)*exp(c - b**2/(4*a))*erfi((2*a*x + b)/(2*sqrt(a)))/(2*sqrt(a)))
 
     from sympy.core.function import expand_mul
     from sympy.abc import k

sympy/stats/sampling/tests/test_sample_discrete_rv.py

@@ -1,7 +1,7 @@
 from sympy.core.singleton import S
-from sympy.core.symbol import Symbol
+#from sympy.core.symbol import Symbol
 from sympy.external import import_module
-from sympy.stats import Geometric, Poisson, Zeta, sample, Skellam, DiscreteRV, Logarithmic, NegativeBinomial, YuleSimon
+from sympy.stats import Geometric, Poisson, Zeta, sample, Skellam, Logarithmic, NegativeBinomial, YuleSimon
 from sympy.testing.pytest import skip, raises, slow
 
 
@@ -27,11 +27,13 @@ def test_sample_numpy():
 
 
 def test_sample_scipy():
-    p = S(2)/3
-    x = Symbol('x', integer=True, positive=True)
-    pdf = p*(1 - p)**(x - 1) # pdf of Geometric Distribution
+    #p = S(2)/3
+    #x = Symbol('x', integer=True, positive=True)
+    #pdf = p*(1 - p)**(x - 1) # pdf of Geometric Distribution
     distribs_scipy = [
-        DiscreteRV(x, pdf, set=S.Naturals),
+        # This one fails:
+        #    https://github.com/sympy/sympy/issues/26862
+        # DiscreteRV(x, pdf, set=S.Naturals),
         Geometric('G', 0.5),
         Logarithmic('L', 0.5),
         NegativeBinomial('N', 5, 0.4),