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

Timestamp:

Jan 8, 2007, 12:08:39 AM (17 years ago)

Author:

Jari Häkkinen

Message:

Fixes #8 and #179, addresses #2.

File:

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

trunk/yat/random/random.cc

@@ -24 +24 @@
 #include "random.h"
 #include "yat/statistics/Histogram.h"
+#include "yat/utility/Exception.h"
 
 #include <fstream>
-#include <iostream>
+#include <sstream>
 
 namespace theplu {
@@ -36 +37 @@
   RNG::RNG(void)
   {
-    gsl_rng_env_setup();  // support rng/seed changes through environment vars
-    rng_ = gsl_rng_alloc(gsl_rng_default);  // Memory is allocated here!
+      // support rng/seed changes through environment vars
+    if (!gsl_rng_env_setup())
+      throw utility::GSL_error("RNG: unknown generator");
+    if (!(rng_=gsl_rng_alloc(gsl_rng_default)))
+      throw utility::GSL_error("RNG: failed to allocate memory");
   }
 
@@ -105 +109 @@
   RNG_state::RNG_state(const RNG* rng)
   {
-    rng_ = gsl_rng_clone(rng->rng()); 
+    if (!(rng_ = gsl_rng_clone(rng->rng())))
+      throw utility::GSL_error("RNG_state: failed to allocate memory");
   }
   
@@ -146 +151 @@
     gen_ = gsl_ran_discrete_preproc( hist.nof_bins(), p );
     delete p;
+    if (!gen_)
+      throw utility::GSL_error("DiscreteGeneral: failed to setup generator.");
   }
 
@@ -163 +170 @@
 
 
-  DiscreteUniform::DiscreteUniform(void)
-    : range_(rng_->max())
-  {
-  }
-
-  DiscreteUniform::DiscreteUniform(const u_long n)
+  DiscreteUniform::DiscreteUniform(u_long n)
     : range_(n)
   {
-    if (range_>rng_->max())
-      range_=rng_->max();
+    if (range_>rng_->max()) {
+      std::stringstream ss("DiscreteUniform: ");
+      ss << n << " is too large for RNG " << rng_->name();
+      throw utility::GSL_error(ss.str());
+    }
   }
 
@@ -178 +183 @@
   u_long DiscreteUniform::operator()(void) const
   {
-    return gsl_rng_uniform_int(rng_->rng(), range_);
-  }
-
-
-  u_long DiscreteUniform::operator()(const u_long n) const
-  {
-    return gsl_rng_uniform_int(rng_->rng(), n);
+    return (range_ ?
+            gsl_rng_uniform_int(rng_->rng(), range_) : gsl_rng_get(rng_->rng()));
+  }
+
+
+  u_long DiscreteUniform::operator()(u_long n) const
+  {
+    // making sure that n is not larger than the range of the
+    // underlying RNG
+    if (n>rng_->max()) {
+      std::stringstream ss("DiscreteUniform::op(): ");
+      ss << n << " is too large for RNG " << rng_->name();
+      throw utility::GSL_error(ss.str());
+    }
+    return gsl_rng_uniform_int(rng_->rng(),n);
   }