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

Timestamp:

Jul 31, 2012, 12:06:52 PM (11 years ago)

Author:

Peter

Message:

RNG::set_state: prefer throw on error.

File:

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

trunk/yat/random/random.cc

@@ -127 +127 @@
     if (rng_.get()==NULL)
       rng_alloc();
-    return gsl_rng_memcpy(rng_.get(), state.rng());
+    if (gsl_rng_memcpy(rng_.get(), state.rng()))
+      throw utility::GSL_error("yat::random::RNG::set_state failed");
+    return 0;
   }
 
@@ -160 +162 @@
     assert(rng_!=&rng);
     if (!(rng_ = gsl_rng_clone(&rng)))
-      throw utility::GSL_error("RNG_state::RNG_state failed to allocate memory");
+      throw utility::GSL_error("RNG_state::clone failed to allocate memory");
   }
 
@@ -179 +181 @@
   }
 
-  
+
   Discrete::~Discrete(void)
   {
@@ -191 +193 @@
 
 
-  unsigned long Discrete::seed_from_devurandom(void) 
-  { 
-    return rng_->seed_from_devurandom(); 
+  unsigned long Discrete::seed_from_devurandom(void)
+  {
+    return rng_->seed_from_devurandom();
   }
 
@@ -201 +203 @@
   {
     p_.reserve(hist.nof_bins());
-    for (size_t i=0; i<hist.nof_bins(); i++) 
+    for (size_t i=0; i<hist.nof_bins(); i++)
       p_.push_back(hist[i]);
     preproc();
@@ -267 +269 @@
   {
     return (range_ ?
-            gsl_rng_uniform_int(rng_->rng(), range_) : gsl_rng_get(rng_->rng()));
+            gsl_rng_uniform_int(rng_->rng(),range_) : gsl_rng_get(rng_->rng()));
   }