Changeset 3612 in Sophya

Timestamp:

Apr 30, 2009, 7:06:50 PM (16 years ago)

Author:

ansari

Message:

Suite modifs / adaptation avec l'introduction de la suite des classes RandomGeneratorInterface et Cie , Reza 30/04/2009

Location:

trunk/SophyaLib/BaseTools

Files:

• basetools.h (modified) (1 diff)
• randinterf.h (modified) (1 diff)
• randr48.h (modified) (1 diff)
• sophyainit.cc (modified) (4 diffs)
• stsrand.cc (modified) (18 diffs)
• stsrand.h (modified) (3 diffs)

trunk/SophyaLib/BaseTools/basetools.h

@@ -21 +21 @@
 #include "perrors.h"
 #include "srandgen.h"
-#include "stsrand.h"
 #include "datatype.h"
+#include "randr48.h"
 #include "randfmt.h"
-#include "randr48.h"
 
 #endif

trunk/SophyaLib/BaseTools/randinterf.h

@@ -15 +15 @@
 namespace SOPHYA {
 
+//! enum definition for usual types of probability distributio finctions
+enum RNDTypes {
+  C_RND_Flat = 0,
+  C_RND_Gaussian = 1,
+  C_RND_Poisson = 2,
+  C_RND_Exponential = 3
+};
+ 
 //! enum definition for the type of algorithm used for Gaussian distribution generation 
 enum GaussianGenAlgo {

trunk/SophyaLib/BaseTools/randr48.h

@@ -34 +34 @@
 
 };
+
 
 //--------------------------------------------------------------------------------

trunk/SophyaLib/BaseTools/sophyainit.cc

@@ -15 +15 @@
 #include "dvlist.h"
 
-#include "stsrand.h"
 #include "randr48.h"
 #include "randfmt.h"
@@ -23 +22 @@
 
 #include "sversion.h"
-
-#include "randr48.h"
 
 #include <iostream>
@@ -71 +68 @@
 
   // --- Les generateurs aleatoires ...
-  DR48RandGen* grgp = new  DR48RandGen;
+  DR48RandGen* grgp = new  ThSDR48RandGen;
   RandomGeneratorInterface::SetGlobalRandGenP(grgp); 
 
@@ -109 +106 @@
 
   // Enregistrement des handlers PPF pour les RandomGenerator
-  PPRegister(ObjFileIO<RandomGenerator>);
-  DObjRegister(ObjFileIO<RandomGenerator>, RandomGenerator);
   PPRegister(ObjFileIO<DR48RandGen>);
   DObjRegister(ObjFileIO<DR48RandGen>,DR48RandGen );

trunk/SophyaLib/BaseTools/stsrand.cc

@@ -9 +9 @@
 
 /*!
-   \class RandomGenerator
+   \class STSRandGen
    \ingroup BaseTools
    \brief Random number generator
@@ -17 +17 @@
    random number generator used.
 
-   \sa SOPHYA::ObjFileIO<RandomGenerator>
+   \sa SOPHYA::ObjFileIO<STSRandGen>
 
    \sa frand01 drand01 frandpm1 drandpm1 
@@ -29 +29 @@
 static ThSafeOp* ths_rand = NULL;
 
-RandomGenerator::RandomGenerator(size_t n, bool tsafe) 
+STSRandGen::STSRandGen(size_t n, bool tsafe) 
 {
   if (ths_rand == NULL)  ths_rand = new ThSafeOp; 
@@ -44 +44 @@
 }
 
-RandomGenerator::RandomGenerator(RandomGenerator const & rg)
+STSRandGen::STSRandGen(STSRandGen const & rg)
 {
   if (ths_rand == NULL)  ths_rand = new ThSafeOp; 
@@ -59 +59 @@
 
 
-RandomGenerator::~RandomGenerator(void) 
+STSRandGen::~STSRandGen(void) 
 {
   // rien a faire 
 }
 
-void RandomGenerator::SetBuffSize(size_t n)
+void STSRandGen::SetBuffSize(size_t n)
 // redimensionnement du buffer
 {
@@ -73 +73 @@
 }
 
-void RandomGenerator::AutoInit(int lp)
+void STSRandGen::AutoInit(int lp)
 // Initialisation automatique (pseudo) aleatoire du generateur.
 // L'initialiseur est donne par un codage du nombre de millisecondes
@@ -133 +133 @@
     }
   }
-  if(lp>0) cout<<"RandomGenerator::AutoInit: "<<seed_16v[0]<<" "<<seed_16v[1]<<" "<<seed_16v[2]<<endl;
+  if(lp>0) cout<<"STSRandGen::AutoInit: "<<seed_16v[0]<<" "<<seed_16v[1]<<" "<<seed_16v[2]<<endl;
 
   // Initialise drand48()
@@ -139 +139 @@
 }
 
-void RandomGenerator::Init(long seed_val, int lp)
-{
-  if (ths_rand == NULL)  ths_rand = new ThSafeOp; 
-  if(lp) cout << "RandomGenerator::Init(long seed=" << seed_val << ")" << endl;
+void STSRandGen::Init(long seed_val, int lp)
+{
+  if (ths_rand == NULL)  ths_rand = new ThSafeOp; 
+  if(lp) cout << "STSRandGen::Init(long seed=" << seed_val << ")" << endl;
   ths_rand->lock();
   srand48(seed_val);
@@ -149 +149 @@
 }
 
-void RandomGenerator::Init(unsigned short seed_16v[3], int lp)
-{
-  if (ths_rand == NULL)  ths_rand = new ThSafeOp; 
-  if(lp) cout << "RandomGenerator::Init(u_short seed_16v[3]=" << seed_16v[0]
+void STSRandGen::Init(unsigned short seed_16v[3], int lp)
+{
+  if (ths_rand == NULL)  ths_rand = new ThSafeOp; 
+  if(lp) cout << "STSRandGen::Init(u_short seed_16v[3]=" << seed_16v[0]
               << "," << seed_16v[1] << "," << seed_16v[2] << ")" << endl;
   ths_rand->lock();
@@ -159 +159 @@
 }
 
-void RandomGenerator::GetSeed(unsigned short seed_16v[3], int lp)
+void STSRandGen::GetSeed(unsigned short seed_16v[3], int lp)
 {
   if (ths_rand == NULL)  ths_rand = new ThSafeOp; 
@@ -165 +165 @@
   GetSeed_P(seed_16v);
   ths_rand->unlock();
-  if(lp) cout << "RandomGenerator::GetSeed(u_short seed_16v[3]=" << seed_16v[0]
+  if(lp) cout << "STSRandGen::GetSeed(u_short seed_16v[3]=" << seed_16v[0]
               << "," << seed_16v[1] << "," << seed_16v[2] << ")" << endl;
   return;
 }
 
-void RandomGenerator::Init_P(unsigned short seed_16v[3])
+void STSRandGen::Init_P(unsigned short seed_16v[3])
 {
   seed48(seed_16v);
 }
 
-void RandomGenerator::GetSeed_P(unsigned short seed_16v[3])
+void STSRandGen::GetSeed_P(unsigned short seed_16v[3])
 {
   unsigned short seed[3] = {0,0,0};
@@ -186 +186 @@
 }
 
-r_8 RandomGenerator::Gaussian() 
+r_8 STSRandGen::Gaussian() 
 {
   r_8 A=Next(); 
@@ -194 +194 @@
 
 
-uint_8 RandomGenerator::Poisson(double mu,double mumax)
+uint_8 STSRandGen::Poisson(double mu,double mumax)
 {
   double pp,ppi,x;
@@ -218 +218 @@
 }
 
-void RandomGenerator::GenSeq(void)
+void STSRandGen::GenSeq(void)
 {
   ths_rand->lock();
@@ -228 +228 @@
 //----------------------------------------------------------
 // Classe pour la gestion de persistance
-// ObjFileIO<RandomGenerator>
+// ObjFileIO<STSRandGen>
 //----------------------------------------------------------
 
 /* --Methode-- */
 DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
-void        ObjFileIO<RandomGenerator>::WriteSelf(POutPersist& s) const
+void        ObjFileIO<STSRandGen>::WriteSelf(POutPersist& s) const
 {
   if (dobj == NULL)
-    throw NullPtrError("ObjFileIO<RandomGenerator>::WriteSelf() dobj=NULL");
+    throw NullPtrError("ObjFileIO<STSRandGen>::WriteSelf() dobj=NULL");
   ths_rand->lock();  // thread-safety
   uint_4 itab[6];
@@ -259 +259 @@
 /* --Methode-- */
 DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
-void        ObjFileIO<RandomGenerator>::ReadSelf(PInPersist& s)
+void        ObjFileIO<STSRandGen>::ReadSelf(PInPersist& s)
 {
   uint_4 itab[6];
@@ -268 +268 @@
   s.Get(ix);  // Taille du tableau intermediaire
 
-  if (dobj == NULL) dobj = new RandomGenerator(sz, (sz>0)?true:false);
+  if (dobj == NULL) dobj = new STSRandGen(sz, (sz>0)?true:false);
   dobj->idx_ = ix;
   if (sz > 0) { 
@@ -288 +288 @@
 // ---------------------------------------------------------
 #ifdef __CXX_PRAGMA_TEMPLATES__
-#pragma define_template ObjFileIO<RandomGenerator>
+#pragma define_template ObjFileIO<STSRandGen>
 #endif
 
 #if defined(ANSI_TEMPLATES) || defined(GNU_TEMPLATES)
-template class ObjFileIO<RandomGenerator>;
+template class ObjFileIO<STSRandGen>;
 #endif
 // ---------------------------------------------------------

trunk/SophyaLib/BaseTools/stsrand.h

@@ -16 +16 @@
 namespace SOPHYA {
 
-class RandomGenerator : public AnyDataObj {
+class STSRandGen : public AnyDataObj {
 
  public:
-  RandomGenerator(size_t n = 1024, bool tsafe=true);
-  RandomGenerator(RandomGenerator const & rg);
+  STSRandGen(size_t n = 1024, bool tsafe=true);
+  STSRandGen(STSRandGen const & rg);
 
   void SetBuffSize(size_t n);
 
-  virtual ~RandomGenerator();
+  virtual ~STSRandGen();
 
   /*! \brief Automatic initialization using the current time */
@@ -72 +72 @@
  
   //  Pour la gestion de persistance PPF
-  friend class ObjFileIO<RandomGenerator> ;
+  friend class ObjFileIO<STSRandGen> ;
 
  protected:
@@ -93 +93 @@
   static  void GetSeed_P(unsigned short seed_16v[3]);
 
-};  // Fin de la classe RandomGenerator
+};  // Fin de la classe STSRandGen
 
-// Classe pour la gestion de persistance PPF :  ObjFileIO<RandomGenerator>
+// Classe pour la gestion de persistance PPF :  ObjFileIO<STSRandGen>
 
 /*! Writes the random generator object state in the POutPersist stream \b os */
-inline POutPersist& operator << (POutPersist& os, RandomGenerator & obj)
-{ ObjFileIO<RandomGenerator> fio(&obj);  fio.Write(os);  return(os); }
+inline POutPersist& operator << (POutPersist& os, STSRandGen & obj)
+{ ObjFileIO<STSRandGen> fio(&obj);  fio.Write(os);  return(os); }
 /*! Reads the random generator object state from the PInPersist stream \b is */
-inline PInPersist& operator >> (PInPersist& is, RandomGenerator & obj)
-{ ObjFileIO<RandomGenerator> fio(&obj); is.SkipToNextObject(); fio.Read(is); return(is); }
+inline PInPersist& operator >> (PInPersist& is, STSRandGen & obj)
+{ ObjFileIO<STSRandGen> fio(&obj); is.SkipToNextObject(); fio.Read(is); return(is); }
 
 } /* namespace SOPHYA */