Changeset 2802 for trunk/yat/random/random.cc

Timestamp:

Jul 29, 2012, 12:13:39 PM (11 years ago)

Author:

Peter

Message:

adding documentation and tests. Remove private member count_ (not needed). closes #568

File:

• trunk/yat/random/random.cc (modified) (3 diffs)

trunk/yat/random/random.cc

@@ -43 +43 @@
       throw utility::GSL_error("RNG::RNG unknown generator");
     seed_ = gsl_rng_default_seed;
-    count_ = 0;
+    // let's allocate already here, just to behave as yat 0.8
+    rng_alloc();
   }
 
@@ -92 +93 @@
     if (!rng)
       throw utility::GSL_error("RNG failed to allocate memory");
-    ++count_;
-    // we init/seed subsequent generators with seed_+count_ to achieve two
-    // things: 1) seed_ imlies that changing seed_ via seed(1),
-    // seed_from_devurandom(), or environment will effect all
-    // generators allocated subsequently. 2) Adding count_ implies
-    // different generators are different.
-    if (count_>1)
-      gsl_rng_set(rng, seed_+count_);
+    gsl_rng_set(rng, seed_);
+    // bump seed to avoid subsequent gsl_rng to be identical
+    ++seed_;
     // rng_ owns rng and takes care of deallocation
     rng_.reset(rng);
@@ -107 +103 @@
   void RNG::seed(unsigned long s) const
   {
-    seed_ = s;
-    count_ = 0;
     gsl_rng_set(rng(),s);
+    seed_ = s+1;
   }