Changeset 3613 in Sophya for trunk/SophyaLib/TArray

Timestamp:

Apr 30, 2009, 7:07:46 PM (16 years ago)

Author:

ansari

Message:

Adaptation a l'introduction de la suite des classes RandomGeneratorInterface et Cie , Reza 30/04/2009

Location:

trunk/SophyaLib/TArray

Files:

• utilarr.cc (modified) (2 diffs)
• utilarr.h (modified) (2 diffs)

trunk/SophyaLib/TArray/utilarr.cc

@@ -5 +5 @@
 #include "machdefs.h"
 #include "utilarr.h"
-#include "stsrand.h"
+#include "randr48.h"
 
 // Classe utilitaires
@@ -20 +20 @@
 */
 
-//! Constructor
-/*!
-  \param typ : generator type
-  \param m : mean parameter of the generator (if needed)
-  \param s : sigma parameter of the generator (if needed)
+/*!
+  \brief constructor using a global default random generator ( RandomGeneratorInterface::GetGlobalRandGenP() )
+  \param typ : generated random numbers distribution type: C_RND_Flat,C_RND_Gaussian,C_RND_Poisson,C_RND_Exponential
+  \param mean : mean value of the distribution 
+  \param sigma : standard deviation of the distribution 
  */
-static RandomGenerator* uarg_ = NULL;
-RandomSequence::RandomSequence(int typ, double m, double s)
-{
-  typ_ = (typ == Flat) ? Flat : Gaussian;
-  mean_ = m;
-  sig_ = s;
-  if (uarg_ == NULL) uarg_ = new RandomGenerator(1024, true);
-}
+RandomSequence::RandomSequence(int typ, double mean, double sigma)
+{
+  typ_ = (typ == Flat) ? C_RND_Flat: C_RND_Gaussian ;
+  mean_ = mean;
+  sig_ = sigma;
+  rgp_ = RandomGeneratorInterface::GetGlobalRandGenP();
+}
+
+
+/*!
+  \brief constructor with the specification of a RandomGenerator object to be used.
+  \param rgen : RandomGeneratorInterface object that should stay valid as long as the RandomSequence object exist.
+  \param typ : generated random numbers distribution type: C_RND_Flat,C_RND_Gaussian,C_RND_Poisson,C_RND_Exponential
+  \param mean : mean value of the distribution 
+  \param sigma : standard deviation of the distribution 
+ */
+RandomSequence::RandomSequence(RandomGeneratorInterface& rgen, RNDTypes rtyp, double mean, double sigma)
+{
+  typ_ = rtyp;
+  mean_ = mean;
+  sig_ = sigma;
+  rgp_ = &rgen;
+}
+
 RandomSequence::~RandomSequence()
 {
 }
 
-//! Return random sequence values.
-/*!
-  \return If typ = Flat : return [-1,+1]*sig + mean
-  \return If typ = Gaussian : return gaussian distributed
-                          with \b mean mean and sigma \b sig
- */
-double RandomSequence::Rand()
-{
-  if (typ_ == Flat) 
-    return(uarg_->Flatpm1()*sig_ + mean_);
-  else return(uarg_->Gaussian(sig_, mean_));
-}
-
+double RandomSequence::Next() const 
+{
+  switch (typ_) {
+    case C_RND_Flat :
+      return rgp_->Flatpm1()*sig_ + mean_;
+      break; 
+    case C_RND_Gaussian :
+      return rgp_->Gaussian(sig_, mean_);
+      break; 
+    case C_RND_Poisson :
+      return rgp_->Poisson(mean_);
+      break; 
+    case C_RND_Exponential :
+      return rgp_->Exponential();
+      break; 
+    default :
+      return rgp_->Flat01();
+      break; 
+
+  }
+}
+
+//!  \brief Return the next random number 
 MuTyV & RandomSequence::Value(sa_size_t k) const 
 {
-  if (typ_ == Flat) retv_ = uarg_->Flatpm1()*sig_ + mean_;
-  else retv_ = uarg_->Gaussian(sig_, mean_);
+  retv_ = Next();
   return retv_;
 }

trunk/SophyaLib/TArray/utilarr.h

@@ -8 +8 @@
 #include "machdefs.h"
 #include "mutyv.h"
+#include "randinterf.h"
 
 #include <stdlib.h>
@@ -56 +57 @@
 
   explicit RandomSequence(int typ = RandomSequence::Gaussian, double m=0., double s=1.);
+  explicit RandomSequence(RandomGeneratorInterface& rgen, RNDTypes rtyp=C_RND_Gaussian, double mean=0., double sigma=1.);
   virtual  ~RandomSequence();
   virtual MuTyV & Value(sa_size_t k) const ;
-  double   Rand();
+  double   Next() const ;
 
 protected:
-  int typ_;            //!< random generation type
+  RNDTypes typ_;            //!< random generation type
   double mean_, sig_;  //!< generation parameters mean and sigma (if needed)
   mutable MuTyV retv_;
+  mutable RandomGeneratorInterface* rgp_;
 };