BUG: Fix incorrect cast

Fix incorrect cast in bounded integers
Add range testing for broadcast bounded integers

Author: bashtage

randomstate/bounded_integers.pxi.in

@@ -241,7 +241,6 @@ cdef object _rand_{{nptype}}(object low, object high, object size, aug_state *st
             raise ValueError('high is out of bounds for {{nptype}}')
         if closed_upper < {{lb}}:
             raise ValueError('low >= high')
-
         highm1_data[i] = <{{nptype}}_t>closed_upper
 
     if np.any(np.greater(low_arr, highm1_arr)):
@@ -264,11 +263,8 @@ cdef object _rand_{{nptype}}(object low, object high, object size, aug_state *st
         for i in range(n):
             low_v = (<{{nptype}}_t*>np.PyArray_MultiIter_DATA(it, 0))[0]
             high_v = (<{{nptype}}_t*>np.PyArray_MultiIter_DATA(it, 1))[0]
-            rng = <{{nptype}}_t>(high_v - low_v) # No -1 here since implemented above
-            off = low_v
-            if rng == 0:
-                out_data[i] = 0
-                continue
+            rng = <{{utype}}_t>(high_v - low_v) # No -1 here since implemented above
+            off = <{{utype}}_t>(<{{nptype}}_t>low_v)
 
             if rng != last_rng:
                 mask = _gen_mask(rng)

randomstate/tests/test_numpy_mt19937.py

@@ -156,6 +156,15 @@ def test_bounds_checking(self):
             assert_raises(ValueError, self.rfunc, ubnd, lbnd, dtype=dt)
             assert_raises(ValueError, self.rfunc, 1, 0, dtype=dt)
 
+    def test_bounds_checking_array(self):
+        for dt in self.itype:
+            lbnd = 0 if dt is bool else np.iinfo(dt).min
+            ubnd = 2 if dt is bool else np.iinfo(dt).max + 1
+            assert_raises(ValueError, self.rfunc, [lbnd - 1], [ubnd], dtype=dt)
+            assert_raises(ValueError, self.rfunc, [lbnd], [ubnd + 1], dtype=dt)
+            assert_raises(ValueError, self.rfunc, ubnd, [lbnd], dtype=dt)
+            assert_raises(ValueError, self.rfunc, [1], 0, dtype=dt)
+
     def test_rng_zero_and_extremes(self):
         for dt in self.itype:
             lbnd = 0 if dt is bool else np.iinfo(dt).min
@@ -170,6 +179,21 @@ def test_rng_zero_and_extremes(self):
             tgt = (lbnd + ubnd) // 2
             assert_equal(self.rfunc(tgt, tgt + 1, size=1000, dtype=dt), tgt)
 
+    def test_rng_zero_and_extremes_array(self):
+        for dt in self.itype:
+            lbnd = 0 if dt is bool else np.iinfo(dt).min
+            ubnd = 2 if dt is bool else np.iinfo(dt).max + 1
+
+            tgt = ubnd - 1
+            print(dt)
+            assert_equal(self.rfunc([tgt], [tgt + 1], size=1000, dtype=dt), tgt)
+
+            tgt = lbnd
+            assert_equal(self.rfunc([tgt], [tgt + 1], size=1000, dtype=dt), tgt)
+
+            tgt = (lbnd + ubnd) // 2
+            assert_equal(self.rfunc([tgt], [tgt + 1], size=1000, dtype=dt), tgt)
+
     def test_full_range(self):
         # Test for ticket #1690
 
@@ -184,6 +208,20 @@ def test_full_range(self):
                                      "but one was with the following "
                                      "message:\n\n%s" % str(e))
 
+    def test_full_range_array(self):
+        # Test for ticket #1690
+
+        for dt in self.itype:
+            lbnd = 0 if dt is bool else np.iinfo(dt).min
+            ubnd = 2 if dt is bool else np.iinfo(dt).max + 1
+
+            try:
+                self.rfunc([lbnd], [ubnd], dtype=dt)
+            except Exception as e:
+                raise AssertionError("No error should have been raised, "
+                                     "but one was with the following "
+                                     "message:\n\n%s" % str(e))
+
     def test_in_bounds_fuzz(self):
         # Don't use fixed seed
         mt19937.seed()
@@ -275,6 +313,17 @@ def test_respect_dtype_singleton(self):
             self.assertEqual(type(sample), dt)
 
 
+    def test_respect_dtype_array(self):
+        # See gh-7203
+        for dt in self.itype:
+            lbnd = 0 if dt is bool else np.iinfo(dt).min
+            ubnd = 2 if dt is bool else np.iinfo(dt).max + 1
+            dt = np.bool_ if dt is bool else dt
+
+            sample = self.rfunc([lbnd], [ubnd], dtype=dt)
+            self.assertEqual(sample.dtype, dt)
+
+
 class TestRandomDist(TestCase):
     # Make sure the random distribution returns the correct value for a
     # given seed