Changeset 3604 in Sophya for trunk/SophyaLib/BaseTools/randinterf.h

Timestamp:

Apr 29, 2009, 12:14:04 PM (16 years ago)

Author:

ansari

Message:

Modifs,petites extensions + numero de version/initialisation de l'instance globale de RandomGenerator, Reza 29/04/2009

File:

• trunk/SophyaLib/BaseTools/randinterf.h (modified) (5 diffs)

trunk/SophyaLib/BaseTools/randinterf.h

@@ -15 +15 @@
 namespace SOPHYA {
 
-//! Definition of the interface for Random number generator classes 
+//! enum definition for the type of algorithm used for Gaussian distribution generation 
+enum GaussianGenAlgo {
+  C_Gaussian_BoxMuller = 0, 
+  C_Gaussian_RandLibSNorm = 1,
+  C_Gaussian_PolarBoxMuller = 2,
+  C_Gaussian_RatioUnif = 3,
+  C_Gaussian_LevaRatioUnif = 4
+};
+
+//! enum definition for the type of algorithm used for Poisson distribution generation 
+enum PoissonGenAlgo {
+  C_Poisson_Simple = 0, 
+  C_Poisson_Ahrens = 1
+};
+
+//! enum definition for the type of algorithm used for exponential distribution generation 
+enum ExponentialGenAlgo {
+  C_Exponential_Simple = 0, 
+  C_Exponential_Ahrens = 1
+};
+
+// Definition de l'interface pour les classes generateur aleatoire
 class RandomGeneratorInterface : public AnyDataObj {
 public:
@@ -21 +42 @@
   virtual ~RandomGeneratorInterface();
 
-  void UseGaussian(uint_2 type=0);
-  void UsePoisson(uint_2 type=0);
-  void UseExpo(uint_2 type=0);
+//! Select Gaussian generation algorithm 
+  inline void SelectGaussianAlgo(GaussianGenAlgo typ=C_Gaussian_BoxMuller) 
+    {  usegaussian_ = typ; }
+//! Select Poisson generation algorithm 
+  inline void SelectPoissonAlgo(PoissonGenAlgo typ=C_Poisson_Simple) 
+    {  usepoisson_ = typ; }
+//! Select Exponential generation algorithm 
+  inline void SelectExponentialAlgo(ExponentialGenAlgo typ=C_Exponential_Simple) 
+    {  useexpo_ = typ; }
 
-  void GenerateSeedVector(int nseed,vector<uint_2>& seed,int lp=0);
+//! Return the Gaussian generation algorithm type
+  inline GaussianGenAlgo GetGaussianAlgo() 
+    {  return usegaussian_; }
+//! Return the Poisson generation algorithm type
+  inline PoissonGenAlgo GetPoissonAlgo() 
+    {  return usepoisson_; }
+//! Return the Exponential generation algorithm type
+//! Select Exponential generation algorithm 
+  inline ExponentialGenAlgo GetExponentialAlgo() 
+    {  return useexpo_; }
+
+  virtual void GenerateSeedVector(int nseed,vector<uint_2>& seed,int lp=0);
 
   // --- Le tirage sur une distribution plate
@@ -35 +73 @@
   // --- Le tirage sur une distribution gaussienne
   /*! \brief Return a random number following a gaussian distribution (sigma=1, mean=0)*/ 
-  inline r_8 Gaussian() 
-         {
-           if(usegaussian_==0) return GaussianBoxMuller();
-           if(usegaussian_==1) return GaussianSNorm();
-           if(usegaussian_==2) return GaussianPolarBoxMuller();
-           if(usegaussian_==3) return GaussianRatioUnif();
-           if(usegaussian_==4) return GaussianLevaRatioUnif();
-           return GaussianBoxMuller();
-         }
+  virtual r_8 Gaussian();
+
   virtual r_8 GaussianBoxMuller(); 
   virtual r_8 GaussianSNorm(); 
@@ -59 +90 @@
   // --- Le tirage sur une distribution de poisson
   /*! \brief Return a random number following a poisson distribution with mean mu */ 
-  inline uint_8 Poisson(double mu, double mumax) 
-         {
-           if(usepoisson_==0) return PoissonSimple(mu,mumax);
-           if(usepoisson_==1) return PoissonAhrens(mu);
-           return PoissonSimple(mu,mumax);
-         }
+  virtual uint_8 Poisson(double mu, double mumax=-1);
   virtual uint_8 PoissonSimple(double mu, double mumax=-1);
   virtual uint_8 PoissonAhrens(double mu);
 
-  // --- Le tirage sur une distribution exponentielle
-  inline r_8 Expo() 
-         {
-           if(useexpo_==0) return ExpoSimple();
-           if(useexpo_==1) return ExpoAhrens();
-           return ExpoSimple();
-         }
+  //! Return a random number with exponential distribution 
+  virtual r_8 Exponential();
+  inline r_8 Expo() { return  Exponential(); }
+
   virtual r_8 ExpoSimple();
   virtual r_8 ExpoAhrens();
@@ -87 +110 @@
          {double r=-log(1.-Next()); return sig*sqrt(2.*r);}
 
+//! Return the pointer to the default global RandomGenerator object 
+  static inline RandomGeneratorInterface* GetGlobalRandGenP()
+    { return gl_rndgen_p; }
+
+// Permet de definir l'instance global du generateur aleatoire
+  static void SetGlobalRandGenP(RandomGeneratorInterface* rgp);
+
 protected:
   //! Return a random number in [0,1] 
   virtual r_8 Next();
-  uint_2 usegaussian_, usepoisson_, useexpo_;
-  
+
+// Selection de type d'algo pour les aleatoires autres que plates
+  GaussianGenAlgo usegaussian_;
+  PoissonGenAlgo usepoisson_;
+  ExponentialGenAlgo useexpo_;
+
+  // Instance global d'un generateur par defaut 
+  static RandomGeneratorInterface* gl_rndgen_p;
 };