Changeset 26586

Timestamp:

11/10/21 09:24:10 (3 years ago)

Author:

bulthuis

Message:

CHG: change names of random generators

Location:

issm/trunk-jpl/src/c

Files:

• shared/Random/randomgenerator.h (modified) (3 diffs)
• solutionsequences/solutionsequence_sampling.cpp (modified) (2 diffs)

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

@@ -9 +9 @@
 #define M_PI 3.141592653589793238462643
 
-class uniform_distribution_rnd
+class rnd_uniform_distribution
 {
 
@@ -23 +23 @@
 
   public:
-    uniform_distribution_rnd() : _seed( 0 ), a( 1103515245 ), c( 12345 ), m( 2147483648 ), a1(0.0), a2(1.0) {}
-    uniform_distribution_rnd(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 ), 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) {}
     void seed( unsigned int s ) { _seed = s; }
     unsigned int get_seed() { return _seed; }
-    double rnd() { return (a2-a1)*(double) drnd()/ m + a1; }
+    double generator() { return (a2-a1)*(double) drnd()/ m + a1; }
 
 };
 
-class normal_distribution_rnd
+class rnd_normal_distribution
 {
 
@@ -40 +40 @@
 
   public:
-    normal_distribution_rnd() : _seed( 0 ), mean( 0), sdev(1.0) {}
-    normal_distribution_rnd(double m,double s) : _seed( 0 ), mean( m ), sdev(s) {}
+    rnd_normal_distribution() : _seed( 0 ), mean( 0), sdev(1.0) {}
+    rnd_normal_distribution(double m,double s) : _seed( 0 ), mean( m ), sdev(s) {}
     void seed( unsigned int s ) { _seed = s; }
-    double rnd()
+    double generator()
     {
-      uniform_distribution_rnd unifdistri;
+      rnd_uniform_distribution unifdistri;
       unifdistri.seed(_seed);
 
-      double u1 = unifdistri.rnd();
-      double u2 = unifdistri.rnd();
+      double u1 = unifdistri.generator();
+      double u2 = unifdistri.generator();
 
       double R = sqrt(-2*log(u1));

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_sampling.cpp ¶

@@ -18 +18 @@
 
         /*Define seed*/
-        normal_distribution_rnd distribution;
+        rnd_normal_distribution distribution;
         if(seed<0){
                 std::random_device rd;
@@ -38 +38 @@
         ppf->GetLocalSize(&M);
         for(int i=0;i<M;i++){
-                rdnumber = distribution.rnd();
+                rdnumber = distribution.generator();
                 ppf->SetValue(local_indices[i],rdnumber,INS_VAL);
         }