REF: Add functions to randomstate object

Sheppard, Kevin · Sheppard, Kevin · commit 9a3f96e822b7 · 2016-02-17T18:37:50.000-05:00
Add random_raw and random_uintegers to randomstate object
diff --git a/randomstate/interface/dSFMT/dSFMT-shim.c b/randomstate/interface/dSFMT/dSFMT-shim.c
@@ -7,7 +7,7 @@ extern inline uint64_t random_uint64(aug_state* state);
 
 extern inline double random_double(aug_state* state);
 
-extern inline uint64_t random_raw(aug_state* state);
+extern inline uint64_t random_raw_values(aug_state* state);
 
 void reset_buffer(aug_state* state)
 {
diff --git a/randomstate/interface/dSFMT/dSFMT-shim.h b/randomstate/interface/dSFMT/dSFMT-shim.h
@@ -64,7 +64,7 @@ static inline double random_double(aug_state* state)
 }
 
 
-static inline uint64_t random_raw(aug_state* state)
+static inline uint64_t random_raw_values(aug_state* state)
 {
     double d = random_double_from_buffer(state);
     return (uint64_t *)&d;
diff --git a/randomstate/interface/mlfg-1279-861/mlfg-1279-861-shim.c b/randomstate/interface/mlfg-1279-861/mlfg-1279-861-shim.c
@@ -6,7 +6,7 @@ extern inline uint64_t random_uint64(aug_state* state);
 
 extern inline double random_double(aug_state* state);
 
-extern inline uint64_t random_raw(aug_state* state);
+extern inline uint64_t random_raw_values(aug_state* state);
 
 void set_seed(aug_state* state, uint64_t val)
 {
diff --git a/randomstate/interface/mlfg-1279-861/mlfg-1279-861-shim.h b/randomstate/interface/mlfg-1279-861/mlfg-1279-861-shim.h
@@ -32,7 +32,7 @@ inline uint64_t random_uint64(aug_state* state)
     return out;
 }
 
-inline uint64_t random_raw(aug_state* state)
+inline uint64_t random_raw_values(aug_state* state)
 {
     return  mlfg_next(state->rng) >> 1;
 }
diff --git a/randomstate/interface/mrg32k3a/mrg32k3a-shim.c b/randomstate/interface/mrg32k3a/mrg32k3a-shim.c
@@ -6,7 +6,7 @@ extern inline uint64_t random_uint64(aug_state* state);
 
 extern inline double random_double(aug_state* state);
 
-extern inline uint64_t random_raw(aug_state* state);
+extern inline uint64_t random_raw_values(aug_state* state);
 
 void entropy_init(aug_state* state)
 {
diff --git a/randomstate/interface/mrg32k3a/mrg32k3a-shim.h b/randomstate/interface/mrg32k3a/mrg32k3a-shim.h
@@ -31,7 +31,7 @@ inline uint64_t random_uint64(aug_state* state)
     return (((uint64_t) mrg32k3a_random(state->rng) << 32) | mrg32k3a_random(state->rng));
 }
 
-inline uint64_t random_raw(aug_state* state)
+inline uint64_t random_raw_values(aug_state* state)
 {
     return (uint64_t)random_uint32(state);
 }
diff --git a/randomstate/interface/pcg-32/pcg-32-shim.c b/randomstate/interface/pcg-32/pcg-32-shim.c
@@ -6,7 +6,7 @@ extern inline uint64_t random_uint64(aug_state* state);
 
 extern inline double random_double(aug_state* state);
 
-extern inline uint64_t random_raw(aug_state* state);
+extern inline uint64_t random_raw_values(aug_state* state);
 
 extern inline void set_seed(aug_state* state, uint64_t seed, uint64_t inc);
 
diff --git a/randomstate/interface/pcg-32/pcg-32-shim.h b/randomstate/interface/pcg-32/pcg-32-shim.h
@@ -35,7 +35,7 @@ inline void advance_state(aug_state* state, uint64_t delta)
     pcg32_advance_r(state->rng, delta);
 }
 
-inline uint64_t random_raw(aug_state* state)
+inline uint64_t random_raw_values(aug_state* state)
 {
     return (uint64_t)random_uint32(state);
 }
diff --git a/randomstate/interface/pcg-64/pcg-64-shim.c b/randomstate/interface/pcg-64/pcg-64-shim.c
@@ -7,7 +7,7 @@ extern inline uint64_t random_uint64(aug_state* state);
 
 extern inline double random_double(aug_state* state);
 
-extern inline uint64_t random_raw(aug_state* state);
+extern inline uint64_t random_raw_values(aug_state* state);
 
 extern inline void advance_state(aug_state* state, pcg128_t delta);
 
diff --git a/randomstate/interface/pcg-64/pcg-64-shim.h b/randomstate/interface/pcg-64/pcg-64-shim.h
@@ -38,7 +38,7 @@ inline uint64_t random_uint64(aug_state* state)
     return pcg64_random_r(state->rng);
 }
 
-inline uint64_t random_raw(aug_state* state)
+inline uint64_t random_raw_values(aug_state* state)
 {
     return random_uint64(state);
 }
diff --git a/randomstate/interface/random-kit/random-kit-shim.c b/randomstate/interface/random-kit/random-kit-shim.c
@@ -4,7 +4,7 @@ extern inline uint32_t random_uint32(aug_state* state);
 
 extern inline uint64_t random_uint64(aug_state* state);
 
-extern inline uint64_t random_raw(aug_state* state);
+extern inline uint64_t random_raw_values(aug_state* state);
 
 extern inline double random_double(aug_state* state);
 
diff --git a/randomstate/interface/random-kit/random-kit-shim.h b/randomstate/interface/random-kit/random-kit-shim.h
@@ -35,7 +35,7 @@ inline double random_double(aug_state* state)
     return (a * 67108864.0 + b) / 9007199254740992.0;
 }
 
-inline uint64_t random_raw(aug_state* state)
+inline uint64_t random_raw_values(aug_state* state)
 {
     return (uint64_t)random_uint32(state);
 }
diff --git a/randomstate/interface/xorshift1024/xorshift1024-shim.c b/randomstate/interface/xorshift1024/xorshift1024-shim.c
@@ -6,7 +6,7 @@ extern inline uint64_t random_uint64(aug_state* state);
 
 extern inline double random_double(aug_state* state);
 
-extern inline uint64_t random_raw(aug_state* state);
+extern inline uint64_t random_raw_values(aug_state* state);
 
 void set_seed(aug_state* state, uint64_t seed)
 {
diff --git a/randomstate/interface/xorshift1024/xorshift1024-shim.h b/randomstate/interface/xorshift1024/xorshift1024-shim.h
@@ -39,7 +39,7 @@ inline uint64_t random_uint64(aug_state* state)
     return xorshift1024_next(state->rng);
 }
 
-inline uint64_t random_raw(aug_state* state)
+inline uint64_t random_raw_values(aug_state* state)
 {
     return random_uint64(state);
 }
diff --git a/randomstate/interface/xorshift128/xorshift128-shim.c b/randomstate/interface/xorshift128/xorshift128-shim.c
@@ -6,7 +6,7 @@ extern inline uint64_t random_uint64(aug_state* state);
 
 extern inline double random_double(aug_state* state);
 
-extern inline uint64_t random_raw(aug_state* state);
+extern inline uint64_t random_raw_values(aug_state* state);
 
 void set_seed(aug_state* state, uint64_t seed)
 {
diff --git a/randomstate/interface/xorshift128/xorshift128-shim.h b/randomstate/interface/xorshift128/xorshift128-shim.h
@@ -39,7 +39,7 @@ inline uint64_t random_uint64(aug_state* state)
     return xorshift128_next(state->rng);
 }
 
-inline uint64_t random_raw(aug_state* state)
+inline uint64_t random_raw_values(aug_state* state)
 {
     return random_uint64(state);
 }
diff --git a/randomstate/randomstate.pyx b/randomstate/randomstate.pyx
@@ -58,7 +58,7 @@ cdef extern from "distributions.h":
 
     cdef uint64_t random_uint64(aug_state* state) nogil
     cdef uint32_t random_uint32(aug_state* state) nogil
-    cdef uint64_t random_raw(aug_state* state) nogil
+    cdef uint64_t random_raw_values(aug_state* state) nogil
 
     cdef long random_positive_int(aug_state* state) nogil
     cdef unsigned long random_uint(aug_state* state) nogil
@@ -633,15 +633,15 @@ cdef class RandomState:
         cdef Py_ssize_t i, n
 
         if size is None:
-            return random_raw(&self.rng_state)
+            return random_raw_values(&self.rng_state)
 
         randoms = <np.ndarray>np.empty(size, np.uint64)
         randoms_data = <uint64_t*>np.PyArray_DATA(randoms)
         n = np.PyArray_SIZE(randoms)
 
         with self.lock, nogil:
             for i in range(n):
-                randoms_data[i] = random_raw(&self.rng_state)
+                randoms_data[i] = random_raw_values(&self.rng_state)
         return randoms
 
     # Pickling support:
@@ -4403,6 +4403,9 @@ permutation = _rand.permutation
 
 sample = ranf = random = random_sample
 
+random_raw = _rand.random_raw
+random_uintegers = _rand.random_uintegers
+
 IF RS_RNG_JUMPABLE:
     jump = _rand.jump
 IF RS_RNG_ADVANCEABLE:

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ extern inline uint64_t random_uint64(aug_state* state);`
`7`	`7`
`8`	`8`	`extern inline double random_double(aug_state* state);`
`9`	`9`
`10`		`-extern inline uint64_t random_raw(aug_state* state);`
	`10`	`+extern inline uint64_t random_raw_values(aug_state* state);`
`11`	`11`
`12`	`12`	`void reset_buffer(aug_state* state)`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ static inline double random_double(aug_state* state)`
`64`	`64`	`}`
`65`	`65`
`66`	`66`
`67`		`-static inline uint64_t random_raw(aug_state* state)`
	`67`	`+static inline uint64_t random_raw_values(aug_state* state)`
`68`	`68`	`{`
`69`	`69`	`double d = random_double_from_buffer(state);`
`70`	`70`	`return (uint64_t *)&d;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ extern inline uint64_t random_uint64(aug_state* state);`
`6`	`6`
`7`	`7`	`extern inline double random_double(aug_state* state);`
`8`	`8`
`9`		`-extern inline uint64_t random_raw(aug_state* state);`
	`9`	`+extern inline uint64_t random_raw_values(aug_state* state);`
`10`	`10`
`11`	`11`	`void set_seed(aug_state* state, uint64_t val)`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ inline uint64_t random_uint64(aug_state* state)`
`32`	`32`	`return out;`
`33`	`33`	`}`
`34`	`34`
`35`		`-inline uint64_t random_raw(aug_state* state)`
	`35`	`+inline uint64_t random_raw_values(aug_state* state)`
`36`	`36`	`{`
`37`	`37`	`return mlfg_next(state->rng) >> 1;`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ inline uint64_t random_uint64(aug_state* state)`
`31`	`31`	`return (((uint64_t) mrg32k3a_random(state->rng) << 32) \| mrg32k3a_random(state->rng));`
`32`	`32`	`}`
`33`	`33`
`34`		`-inline uint64_t random_raw(aug_state* state)`
	`34`	`+inline uint64_t random_raw_values(aug_state* state)`
`35`	`35`	`{`
`36`	`36`	`return (uint64_t)random_uint32(state);`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ inline void advance_state(aug_state* state, uint64_t delta)`
`35`	`35`	`pcg32_advance_r(state->rng, delta);`
`36`	`36`	`}`
`37`	`37`
`38`		`-inline uint64_t random_raw(aug_state* state)`
	`38`	`+inline uint64_t random_raw_values(aug_state* state)`
`39`	`39`	`{`
`40`	`40`	`return (uint64_t)random_uint32(state);`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ inline uint64_t random_uint64(aug_state* state)`
`38`	`38`	`return pcg64_random_r(state->rng);`
`39`	`39`	`}`
`40`	`40`
`41`		`-inline uint64_t random_raw(aug_state* state)`
	`41`	`+inline uint64_t random_raw_values(aug_state* state)`
`42`	`42`	`{`
`43`	`43`	`return random_uint64(state);`
`44`	`44`	`}`