Changeset 481

Timestamp:

09/26/07 03:57:40 (14 months ago)

Author:

krobillard

Message:

mt19937ar.c now uses uint32_t rather than unsigned long.

Files:

• trunk/thune/support/mt19937ar.c (modified) (8 diffs)

trunk/thune/support/mt19937ar.c

@@ -40 +40 @@
    http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
    email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space)
+
+
+   Modified by Karl Robillard to use uint32_t
 */
 
+#include <stdint.h>
 #include <stdio.h>
 
@@ -51 +55 @@
 #define LOWER_MASK 0x7fffffffUL /* least significant r bits */
 
-static unsigned long mt[N]; /* the array for the state vector  */
-static int mti=N+1; /* mti==N+1 means mt[N] is not initialized */
+static uint32_t mt[N]; /* the array for the state vector  */
+static int32_t mti=N+1; /* mti==N+1 means mt[N] is not initialized */
 
 /* initializes mt[N] with a seed */
-void init_genrand(unsigned long s)
+void init_genrand(uint32_t s)
 {
     mt[0]= s & 0xffffffffUL;
@@ -65 +69 @@
         /* only MSBs of the array mt[].                        */
         /* 2002/01/09 modified by Makoto Matsumoto             */
+#if 0
         mt[mti] &= 0xffffffffUL;
         /* for >32 bit machines */
-    }
-}
-
-#if 0
+#endif
+    }
+}
+
+#ifdef UNIT_TEST
 /* initialize by an array with array-length */
 /* init_key is the array for initializing keys */
 /* key_length is its length */
 /* slight change for C++, 2004/2/26 */
-void init_by_array(unsigned long init_key[], int key_length)
+void init_by_array(uint32_t init_key[], int key_length)
 {
     int i, j, k;
@@ -102 +108 @@
 
 /* generates a random number on [0,0xffffffff]-interval */
-unsigned long genrand_int32(void)
-{
-    unsigned long y;
-    static unsigned long mag01[2]={0x0UL, MATRIX_A};
+uint32_t genrand_int32(void)
+{
+    uint32_t y;
+    static uint32_t mag01[2]={0x0UL, MATRIX_A};
     /* mag01[x] = x * MATRIX_A  for x=0,1 */
 
@@ -141 +147 @@
 #if 0
 /* generates a random number on [0,0x7fffffff]-interval */
-long genrand_int31(void)
-{
-    return (long)(genrand_int32()>>1);
+int32_t genrand_int31(void)
+{
+    return (int32_t)(genrand_int32()>>1);
 }
 
@@ -161 +167 @@
 }
 
-#if 0
+#ifdef UNIT_TEST
 /* generates a random number on (0,1)-real-interval */
 double genrand_real3(void)
@@ -172 +178 @@
 double genrand_res53(void) 
 { 
-    unsigned long a=genrand_int32()>>5, b=genrand_int32()>>6; 
+    uint32_t a=genrand_int32()>>5, b=genrand_int32()>>6; 
     return(a*67108864.0+b)*(1.0/9007199254740992.0); 
 } 
@@ -180 +186 @@
 {
     int i;
-    unsigned long init[4]={0x123, 0x234, 0x345, 0x456}, length=4;
+    uint32_t init[4]={0x123, 0x234, 0x345, 0x456}, length=4;
     init_by_array(init, length);
     printf("1000 outputs of genrand_int32()\n");