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

Timestamp:

Dec 26, 2006, 10:56:26 AM (17 years ago)

Author:

Jari Häkkinen

Message:

Addresses #170.

File:

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

trunk/yat/random/random.cc

@@ -34 +34 @@
   RNG* RNG::instance_ = NULL;
 
-
   RNG::RNG(void)
   {
@@ -50 +49 @@
 
   
+  u_long RNG::max(void) const
+  {
+    return gsl_rng_max(rng_);
+  }
+
+
+  u_long RNG::min(void) const
+  {
+    return gsl_rng_min(rng_);
+  }
+
+
+  std::string RNG::name(void) const
+  {
+    return gsl_rng_name(rng_);
+  }
+
+
+  const gsl_rng* RNG::rng(void) const
+  {
+    return rng_;
+  }
+
+
+  void RNG::seed(u_long s) const
+  {
+    gsl_rng_set(rng_,s);
+  }
+
+
   u_long RNG::seed_from_devurandom(void)
   {
@@ -72 +101 @@
   }
 
+  // --------------------- RNG_state ----------------------------------
 
   RNG_state::RNG_state(const RNG* rng)
@@ -85 +115 @@
   }
 
+  const gsl_rng* RNG_state::rng(void) const
+  {
+    return rng_;
+  }
+
   // --------------------- Discrete distribtuions ---------------------
 
@@ -95 +130 @@
   Discrete::~Discrete(void)
   {
+  }
+
+
+  void Discrete::seed(u_long s) const
+  {
+    rng_->seed(s);
   }
 
@@ -116 +157 @@
 
 
+  u_long DiscreteGeneral::operator()(void) const
+  {
+    return gsl_ran_discrete(rng_->rng(), gen_);
+  }
+
+
+  DiscreteUniform::DiscreteUniform(void)
+    : range_(rng_->max())
+  {
+  }
+
+  DiscreteUniform::DiscreteUniform(const u_long n)
+    : range_(n)
+  {
+    if (range_>rng_->max())
+      range_=rng_->max();
+  }
+
+
+  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);
+  }
+
+
   Poisson::Poisson(const double m)
     : m_(m)
@@ -121 +193 @@
   }
 
+  u_long Poisson::operator()(void) const
+  {
+    return gsl_ran_poisson(rng_->rng(), m_);
+  }
+
+
+  u_long Poisson::operator()(const double m) const
+  {
+    return gsl_ran_poisson(rng_->rng(), m);
+  }
+
   // --------------------- Continuous distribtuions ---------------------
 
@@ -134 +217 @@
 
 
+  void Continuous::seed(u_long s) const
+  {
+    rng_->seed(s);
+  }
+
+
   ContinuousGeneral::ContinuousGeneral(const statistics::Histogram& hist)
     : discrete_(DiscreteGeneral(hist)), hist_(hist)
@@ -140 +229 @@
 
 
+  double ContinuousGeneral::operator()(void) const
+  {
+    return hist_.observation_value(discrete_())+(u_()-0.5)*hist_.spacing();
+  }
+
+  double ContinuousUniform::operator()(void) const
+  {
+    return gsl_rng_uniform(rng_->rng());
+  }
+
+
   Exponential::Exponential(const double m)
     : m_(m)
@@ -146 +246 @@
 
 
+  double Exponential::operator()(void) const
+  {
+    return gsl_ran_exponential(rng_->rng(), m_);
+  }
+
+
+  double Exponential::operator()(const double m) const
+  {
+    return gsl_ran_exponential(rng_->rng(), m);
+  }
+
+
   Gaussian::Gaussian(const double s, const double m)
     : m_(m), s_(s)
@@ -151 +263 @@
   }
 
+
+  double Gaussian::operator()(void) const
+  {
+    return gsl_ran_gaussian(rng_->rng(), s_)+m_;
+  }
+
+
+  double Gaussian::operator()(const double s) const
+  {
+    return gsl_ran_gaussian(rng_->rng(), s);
+  }
+
+
+  double Gaussian::operator()(const double s, const double m) const
+  {
+    return gsl_ran_gaussian(rng_->rng(), s)+m;
+  }
+
 }}} // of namespace random, yat, and theplu