Merge pull request sympy#20302 from oscarbenjamin/pr_lambdify_scipy

oscarbenjamin · web-flow · commit 900d959cf7f4 · 2020-10-20T22:04:34.000+01:00
Fixed lambdify usage in stats (1.7 branch)
diff --git a/bin/test_travis.sh b/bin/test_travis.sh
@@ -187,6 +187,9 @@ test_list = [
     'sympy/logic',
     'sympy/assumptions',
 
+    #stats
+    'sympy/stats',
+
 ]
 
 blacklist = [
@@ -229,6 +232,9 @@ doctest_list = [
     'sympy/logic',
     'sympy/assumptions',
 
+    #stats
+    'sympy/stats',
+
 ]
 
 if not (sympy.test(*test_list, blacklist=blacklist) and sympy.doctest(*doctest_list)):
diff --git a/sympy/stats/crv.py b/sympy/stats/crv.py
@@ -156,7 +156,7 @@ def _sample_scipy(cls, dist, size):
         # scipy does not require map as it can handle using custom distributions
         from scipy.stats import rv_continuous
         z = Dummy('z')
-        handmade_pdf = lambdify(z, dist.pdf(z), 'scipy')
+        handmade_pdf = lambdify(z, dist.pdf(z), ['numpy', 'scipy'])
         class scipy_pdf(rv_continuous):
             def _pdf(self, x):
                 return handmade_pdf(x)
diff --git a/sympy/stats/drv.py b/sympy/stats/drv.py
@@ -53,7 +53,7 @@ def _sample_scipy(cls, dist, size):
         if dist.__class__.__name__ == 'DiscreteDistributionHandmade':
             from scipy.stats import rv_discrete
             z = Dummy('z')
-            handmade_pmf = lambdify(z, dist.pdf(z), 'scipy')
+            handmade_pmf = lambdify(z, dist.pdf(z), ['numpy', 'scipy'])
             class scipy_pmf(rv_discrete):
                 def _pmf(self, x):
                     return handmade_pmf(x)
diff --git a/sympy/stats/tests/test_continuous_rv.py b/sympy/stats/tests/test_continuous_rv.py
@@ -1328,7 +1328,7 @@ def test_prefab_sampling():
     size = 5
     with ignore_warnings(UserWarning): ### TODO: Restore tests once warnings are removed
         for var in variables:
-            for i in range(niter):
+            for _ in range(niter):
                 assert next(sample(var)) in var.pspace.domain.set
                 samps = next(sample(var, size=size))
                 for samp in samps:
diff --git a/sympy/stats/tests/test_stochastic_process.py b/sympy/stats/tests/test_stochastic_process.py
@@ -237,7 +237,7 @@ def test_sample_stochastic_process():
     Y = DiscreteMarkovChain("Y", [0, 1, 2], T)
     for samps in range(10):
         assert next(sample_stochastic_process(Y)) in Y.state_space
-    Z = DiscreteMarkovChain("Z", ['1', 1, None], T)
+    Z = DiscreteMarkovChain("Z", ['1', 1, 0], T)
     for samps in range(10):
         assert next(sample_stochastic_process(Z)) in Z.state_space
 
