Changeset 26590

Timestamp:

11/10/21 11:39:38 (3 years ago)

Author:

bulthuis

Message:

CHG: some changes in pseudo-random number generator classes

File:

• issm/trunk-jpl/src/c/shared/Random/randomgenerator.h (modified) (3 diffs)

issm/trunk-jpl/src/c/shared/Random/randomgenerator.h

@@ -17 +17 @@
     unsigned int m;
     unsigned _seed;
-    double a1;
-    double a2;
+    double lbound;
+    double ubound;
 
     int drnd() { return( _seed = ( a * _seed + c ) % m ); }
@@ -25 +25 @@
 
     /*constructors, destructors: */
-    rnd_uniform_distribution() : _seed( 0 ), a( 1103515245 ), c( 12345 ), m( 2147483648 ), a1(0.0), a2(1.0) {}
-    rnd_uniform_distribution(double a_1,double a_2) : _seed( 0 ), a( 1103515245 ), c( 12345 ), m( 2147483648 ), a1(a_1), a2(a_2) {}
+    rnd_uniform_distribution() : _seed( 0 ), a( 1103515245 ), c( 12345 ), m( 2147483648 ), lbound(0.0), ubound(1.0) {}
+    rnd_uniform_distribution(double a_1,double a_2) : _seed( 0 ), a( 1103515245 ), c( 12345 ), m( 2147483648 ), lbound(a_1), ubound(a_2) {}
+    ~rnd_uniform_distribution(){}
     void seed( unsigned int s ) { _seed = s; }
     unsigned int get_seed() { return _seed; }
-    double generator() { return (a2-a1)*(double) drnd()/ m + a1; }
+    double generator() { return (ubound-lbound)*(double) drnd()/ m + lbound; }
 
 };
@@ -44 +45 @@
     rnd_normal_distribution() : _seed( 0 ), mean( 0), sdev(1.0) {}
     rnd_normal_distribution(double m,double s) : _seed( 0 ), mean( m ), sdev(s) {}
+    ~rnd_normal_distribution(){}
     void seed( unsigned int s ) { _seed = s; }
     double generator()