Changeset 362

Timestamp:

Aug 5, 2005, 12:22:23 AM (18 years ago)

Author:

Jari Häkkinen

Message:

First usable minimal version of new Random.

Location:

trunk/lib/utility

Files:

• Makefile.am (modified) (2 diffs)
• Random.cc (added)
• Random.h (modified) (2 diffs)

trunk/lib/utility/Makefile.am

@@ -10 +10 @@
 libutility_la_SOURCES = \
   Alignment.cc FileIO.cc kNNI.cc Merge.cc NNI.cc PCA.cc\
-  random_singleton.cc stl_utility.cc SVD.cc utility.cc WeNNI.cc
+  Random.cc random_singleton.cc stl_utility.cc SVD.cc utility.cc WeNNI.cc
 
 include_utilitydir = $(includedir)/c++_tools/utility
@@ -16 +16 @@
 include_utility_HEADERS = \
   Alignment.h Exception.h FileIO.h kNNI.h Merge.h NNI.h PCA.h \
-  random_singleton.h stl_utility.h SVD.h utility.h WeNNI.h
+  Random.h random_singleton.h stl_utility.h SVD.h utility.h WeNNI.h
 

trunk/lib/utility/Random.h

@@ -1 @@
-// $Id$
+ // $Id$
 
 #ifndef _theplu_utility_random_
 #define _theplu_utility_random_
 
-// #include <string>
 
-// #include <gsl/gsl_rng.h>
-// #include <gsl/gsl_randist.h>
+#include <gsl/gsl_rng.h>
+#include <gsl/gsl_randist.h>
 
 namespace theplu {
@@ -13 +12 @@
 
   ///
-  /// Base class
+  /// The RNG class provides a single global random number generator
+  /// instance with one point of access to the generator.
   ///
-  class Random {
+  /// This is probably not thread safe.
+  ///
+  /// @see Design Patterns (the singleton and adapter pattern)
+  ///
+  class RNG
+  {
   public:
 
+    virtual ~RNG(void);
+
+    static RNG* instance(int seed);
+
+    inline const gsl_rng* rng(void) const { return rng_; }
+
   private:
-    Random(void);
 
-    gsl_rng* rng_; 
+    RNG(void);
+
+    static RNG* instance_;
+    gsl_rng* rng_;
   };
 
 
-  class RandomContinuous {
+
+  class RandomContinuous
+  {
+  public:
+
+    inline RandomContinuous(void) { rng_=RNG::instance(89); }
+
+    virtual double operator()(void) const = 0;
+
+  protected:
+    RNG* rng_;
   };
 
 
-  class RandomContinuousUniform : public RandomContinuous {
+
+  class RandomContinuousUniform : public RandomContinuous
+  {
+  public:
+
+    inline double operator()(void) const { return gsl_rng_uniform(rng_->rng()); }
+
+  };
+
+
+
+  class RandomGaussian : public RandomContinuous
+  {
+  public:
+    inline RandomGaussian(const double s=1, const double m=0) 
+      : m_(m), s_(s) {}
+
+    inline double operator()(void) const 
+    { return gsl_ran_gaussian(rng_->rng(), s_)+m_; }
+
+    inline double operator()(const double s) const 
+    { return gsl_ran_gaussian(rng_->rng(), s); }
+
+    inline double operator()(const double s, const double m) const 
+    { return gsl_ran_gaussian(rng_->rng(), s)+m; }
+
+  private:
+    double m_;
+    double s_;
   };