Merge pull request #40 from bashtage/randomkit-refactor

REF: Refactor randomkit

Author: bashtage

randomstate/distributions.h

@@ -108,7 +108,7 @@ extern double random_triangular(aug_state *state, double left, double mode, doub
 
 extern long random_poisson(aug_state *state, double lam);
 
-extern long rk_negative_binomial(aug_state *state, double n, double p);
+extern long random_negative_binomial(aug_state *state, double n, double p);
 
 extern long random_binomial(aug_state *state, double p, long n);
 

randomstate/interface/dSFMT/dSFMT-shim.h

@@ -1,5 +1,3 @@
-#define RNG_TYPE rk_state
-
 #ifdef _WIN32
 #include "../../src/common/stdint.h"
 #define inline __forceinline

randomstate/interface/pcg-32/pcg-32-shim.h

@@ -1,5 +1,3 @@
-#define RNG_TYPE pcg32_random_t
-
 #include <stdint.h>
 #include "../../src/common/binomial.h"
 #include "../../src/common/entropy.h"

randomstate/interface/pcg-64/pcg-64-shim.h

@@ -1,5 +1,3 @@
-#define RNG_TYPE pcg64_random_t
-
 #ifdef _WIN32
 #include "../../src/common/inttypes.h"
 #define inline __forceinline

randomstate/interface/random-kit/random-kit-shim.c

@@ -6,14 +6,14 @@ extern inline uint64_t random_uint64(aug_state* state);
 
 extern inline double random_double(aug_state* state);
 
-extern void set_seed_by_array(aug_state* state, unsigned long init_key[], int key_length)
+void set_seed_by_array(aug_state* state, uint32_t *init_key, int key_length)
 {
-    init_by_array(state->rng, init_key, key_length);
+    randomkit_init_by_array(state->rng, init_key, key_length);
 }
 
 void set_seed(aug_state* state, uint32_t seed)
 {
-    rk_seed(state->rng, seed);
+    randomkit_seed(state->rng, seed);
 }
 
 void entropy_init(aug_state* state)

randomstate/interface/random-kit/random-kit-shim.h

@@ -1,5 +1,3 @@
-#define RNG_TYPE rk_state
-
 #ifdef _WIN32
 #include "../../src/common/stdint.h"
 #define inline __forceinline
@@ -12,7 +10,7 @@
 #include "../../src/random-kit/random-kit.h"
 
 typedef struct s_aug_state {
-    rk_state *rng;
+    randomkit_state *rng;
     binomial_t *binomial;
 
     int has_gauss, shift_zig_random_int, has_uint32;
@@ -23,12 +21,12 @@ typedef struct s_aug_state {
 
 inline uint32_t random_uint32(aug_state* state)
 {
-    return rk_random(state->rng);
+    return randomkit_random(state->rng);
 }
 
 inline uint64_t random_uint64(aug_state* state)
 {
-    return (((uint64_t) rk_random(state->rng)) << 32) | rk_random(state->rng);
+    return (((uint64_t) randomkit_random(state->rng)) << 32) | randomkit_random(state->rng);
 }
 
 inline double random_double(aug_state* state)
@@ -39,7 +37,7 @@ inline double random_double(aug_state* state)
 
 extern void entropy_init(aug_state* state);
 
-extern void set_seed_by_array(aug_state* state, unsigned long init_key[], int key_length);
+extern void set_seed_by_array(aug_state* state, uint32_t *init_key, int key_length);
 
 extern void set_seed(aug_state* state, uint32_t seed);
 

randomstate/interface/random-kit/random-kit.pxi

@@ -7,14 +7,14 @@ ctypedef uint32_t rng_state_t
 
 cdef extern from "distributions.h":
 
-    cdef struct s_rk_state:
+    cdef struct s_randomkit_state:
       uint32_t key[RK_STATE_LEN]
       int pos
 
-    ctypedef s_rk_state rk_state
+    ctypedef s_randomkit_state randomkit_state
 
     cdef struct s_aug_state:
-        rk_state *rng
+        randomkit_state *rng
         binomial_t *binomial
 
         int has_gauss, shift_zig_random_int, has_uint32
@@ -26,11 +26,9 @@ cdef extern from "distributions.h":
 
     cdef void set_seed(aug_state* state, uint32_t seed)
 
-    cdef void set_seed_by_array(aug_state* state, unsigned long init_key[], int key_length)
+    cdef void set_seed_by_array(aug_state* state, uint32_t *init_key, int key_length)
 
-
-
-ctypedef rk_state rng_t
+ctypedef randomkit_state rng_t
 
 cdef object _get_state(aug_state state):
     cdef uint32_t [:] key = np.zeros(RK_STATE_LEN, dtype=np.uint32)

randomstate/randomstate.pyx

@@ -216,7 +216,7 @@ cdef class RandomState:
             RandomState
 
             """
-            # cdef ndarray obj "arrayObject_obj"
+            cdef np.ndarray obj
             try:
                 if seed is None:
                     self.__seed = seed = _generate_seed(1)
@@ -232,10 +232,10 @@ cdef class RandomState:
                 obj = np.asarray(seed).astype(np.int64, casting='safe')
                 if ((obj > int(2**32 - 1)) | (obj < 0)).any():
                     raise ValueError("Seed must be between 0 and 4294967295")
-                obj = obj.astype('L', casting='unsafe')
+                obj = obj.astype(np.uint32, casting='unsafe', order='C')
                 with self.lock:
                     set_seed_by_array(&self.rng_state,
-                                      <unsigned long *>np.PyArray_DATA(obj),
+                                      <uint32_t*> obj.data,
                                       np.PyArray_DIM(obj, 0))
             self._reset_state_variables()
 

randomstate/src/random-kit/random-kit-test-gen.c

@@ -6,8 +6,8 @@ int main(void)
 {
     int i;
     uint32_t temp, seed = 1UL;
-    rk_state state = {{ 0 }};
-    rk_seed(&state, seed);
+    randomkit_state state = {{ 0 }};
+    randomkit_seed(&state, seed);
 
     FILE *fp;
     fp = fopen("randomkit-testset-1.csv", "w");
@@ -18,14 +18,14 @@ int main(void)
     fprintf(fp, "seed, %" PRIu32 "\n", seed);
     for (i=0; i < 1000; i++)
     {
-        temp = rk_random(&state);
+        temp = randomkit_random(&state);
         fprintf(fp, "%d, %" PRIu32 "\n", i, temp);
         printf("%d, %" PRIu32 "\n", i, temp);
     }
     fclose(fp);
 
     seed = 123456789UL;
-    rk_seed(&state, seed);
+    randomkit_seed(&state, seed);
     fp = fopen("randomkit-testset-2.csv", "w");
     if(fp == NULL){
          printf("Couldn't open file\n");
@@ -34,7 +34,7 @@ int main(void)
     fprintf(fp, "seed, %" PRIu32 "\n", seed);
     for (i=0; i < 1000; i++)
     {
-        temp = rk_random(&state);
+        temp = randomkit_random(&state);
         fprintf(fp, "%d, %" PRIu32 "\n", i, temp);
         printf("%d, %" PRIu32 "\n", i, temp);
     }

randomstate/src/random-kit/random-kit.c

@@ -1,8 +1,8 @@
 #include "random-kit.h"
 
-extern inline uint32_t rk_random(rk_state *state);
+extern inline uint32_t randomkit_random(randomkit_state *state);
 
-void rk_seed(rk_state *state, uint32_t seed)
+void randomkit_seed(randomkit_state *state, uint32_t seed)
 {
     int pos;
     seed &= 0xffffffffUL;
@@ -17,7 +17,7 @@ void rk_seed(rk_state *state, uint32_t seed)
 
 
 /* initializes mt[RK_STATE_LEN] with a seed */
-static void init_genrand(rk_state *state, unsigned long s)
+static void init_genrand(randomkit_state *state, uint32_t s)
 {
     int mti;
     uint32_t *mt = state->key;
@@ -44,7 +44,7 @@ static void init_genrand(rk_state *state, unsigned long s)
  * init_key is the array for initializing keys
  * key_length is its length
  */
-extern void init_by_array(rk_state *state, unsigned long init_key[], int key_length)
+void randomkit_init_by_array(randomkit_state *state, uint32_t *init_key, int key_length)
 {
     /* was signed in the original code. RDH 12/16/2002 */
     int i = 1;
@@ -84,7 +84,7 @@ extern void init_by_array(rk_state *state, unsigned long init_key[], int key_len
     mt[0] = 0x80000000UL; /* MSB is 1; assuring non-zero initial array */
 }
 
-void rk_gen(rk_state *state)
+void randomkit_gen(randomkit_state *state)
 {
     uint32_t y;
     int i;