Changeset 6664

Timestamp:

03/14/09 15:18:53 (18 months ago)

Author:

charris

Message:

Fix tickets #921 and #923. Add regression tests.

Location:

trunk/numpy/random

Files:

• mtrand/distributions.c (modified) (2 diffs)
• tests/test_random.py (modified) (2 diffs)

trunk/numpy/random/mtrand/distributions.c

@@ -815 +815 @@
     
     /* another fix from rv.py to allow sample to exceed popsize/2 */
-    if (m < sample) Z = bad - Z;
+    if (m < sample) Z = good - Z;
     
     return Z;
@@ -877 +877 @@
             }
         }
-        if (V <= q) {
+        if (V >= q) {
             return 1;
         }

trunk/numpy/random/tests/test_random.py

@@ -2 +2 @@
 from numpy import random
 import numpy as np
+
+class TestRegression(TestCase):
+
+    def test_VonMises_range(self):
+        """Make sure generated random variables are in [-pi, pi].
+
+        Regression test for ticket #986.
+        """
+        for mu in np.linspace(-7., 7., 5):
+            r = random.mtrand.vonmises(mu,1,50)
+            assert np.all(r > -np.pi) and np.all(r <= np.pi)
+
+    def test_hypergeometric_range(self) :
+        """Test for ticket #921"""
+        assert_(np.all(np.random.hypergeometric(3, 18, 11, size=10) < 4))
+        assert_(np.all(np.random.hypergeometric(18, 3, 11, size=10) > 0))
+
+    def test_logseries_convergence(self) :
+        """Test for ticket #923"""
+        N = 100000
+        rvsn = np.random.logseries(0.8, size=N)
+        # these two frequency counts should be close to theoretical
+        # numbers with this large sample
+        # theoretical large N result is 0.49706795
+        freq = np.sum(rvsn == 1) / float(N)
+        msg = "Obsevered frequency was %f, should be > 0.45" % freq
+        assert_(freq > 0.45, msg)
+        # theoretical large N result is 0.19882718
+        freq = np.sum(rvsn == 2) / float(N)
+        msg = "Obsevered frequency was %f, should be < 0.23" % freq
+        assert_(freq < 0.23, msg)
+
 
 class TestMultinomial(TestCase):
@@ -15 +47 @@
         assert np.all(-5 <= x)
         assert np.all(x < -1)
-
-class TestVonMises(TestCase):
-    def test_output_domain(self):
-        """Make sure generated random variables are in [-pi, pi].
-
-        Regression test for ticket #986.
-        """
-        for mu in np.linspace(-7., 7., 5):        
-            r = random.mtrand.vonmises(mu,1,50)
-            assert np.all(r>-np.pi) and np.all(r<=np.pi)