Changeset 3613 in Sophya

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

Files:

• SophyaLib/Samba/alm.cc (modified) (3 diffs)
• SophyaLib/Samba/alm.h (modified) (3 diffs)
• SophyaLib/Samba/sphericaltransformserver.cc (modified) (5 diffs)
• SophyaLib/Samba/sphericaltransformserver.h (modified) (3 diffs)
• SophyaLib/TArray/utilarr.cc (modified) (2 diffs)
• SophyaLib/TArray/utilarr.h (modified) (2 diffs)
• SophyaProg/PrgMap/cl2map.cc (modified) (2 diffs)
• SophyaProg/Tests/tmtrnd.cc (modified) (1 diff)
• SophyaProg/Tests/tmtrnd3.cc (modified) (9 diffs)

trunk/SophyaLib/Samba/alm.cc

@@ -20 +20 @@
 
   //alm.ReSize(nlmax);
-  this->ReSizeRow(nlmax+1);
-  RandomGenerator rg(1, false);
-  GenFromCl(clin, fwhm, rg);
+  this->ReSizeRow(nlmax+1); 
+  GenFromCl(clin, fwhm, *(RandomGeneratorInterface::GetGlobalRandGenP()) );
 }
 
@@ -29 +28 @@
 */
 template <class T>
-Alm<T>::Alm(const TVector<T>& clin, const r_8 fwhm, RandomGenerator & rg)
+Alm<T>::Alm(const TVector<T>& clin, const r_8 fwhm, RandomGeneratorInterface & rg)
 {
   int_4 nlmax= clin.NElts()-1;
@@ -41 +40 @@
 
 template <class T>
-void Alm<T>::GenFromCl(const TVector<T> & clin, const r_8 fwhm, RandomGenerator & rg)
+void Alm<T>::GenFromCl(const TVector<T> & clin, const r_8 fwhm, RandomGeneratorInterface & rg)
 {
   /*=======================================================================

trunk/SophyaLib/Samba/alm.h

@@ -6 +6 @@
 #define ALM_SEEN
 
-#include "stsrand.h"
+#include "randinterf.h"
 #include "nbmath.h"
 #include "triangmtx.h"
@@ -26 +26 @@
   Alm(const TVector<T> & clin, const r_8 fwhm) ;
 //! Constructor, generates alm from a cl vector, using the specified random generator object
-  Alm(const TVector<T> & clin, const r_8 fwhm, RandomGenerator & rg);
+  Alm(const TVector<T> & clin, const r_8 fwhm, RandomGeneratorInterface& rg);
 
 //! Resize with a new lmax 
@@ -41 +41 @@
 
 private:
-  void GenFromCl(const TVector<T> & clin, const r_8 fwhm, RandomGenerator& rg);
+  void GenFromCl(const TVector<T> & clin, const r_8 fwhm, RandomGeneratorInterface& rg);
 };
 

trunk/SophyaLib/Samba/sphericaltransformserver.cc

@@ -6 +6 @@
 #include "sphericaltransformserver.h"
 #include "tvector.h"
-#include "stsrand.h"
 #include "nbmath.h"
 #include "timing.h"
@@ -156 +155 @@
 template<class T>
 SphericalTransformServer<T>::SphericalTransformServer()
-: rg_(1, false) 
+: rgp_(RandomGeneratorInterface::GetGlobalRandGenP()) 
 {
   fftIntfPtr_=new FFTPackServer(true); // preserveinput = true
@@ -164 +163 @@
 //!  Constructor with the specification of a RandomGenerator object to be used by GenerateFromCl 
 template<class T>
-SphericalTransformServer<T>::SphericalTransformServer(RandomGenerator const & rg)
-: rg_(rg) 
+SphericalTransformServer<T>::SphericalTransformServer(RandomGeneratorInterface& rg)
+: rgp_(&rg) 
 {
   fftIntfPtr_=new FFTPackServer(true); // preserveinput = true
@@ -1312 +1311 @@
   //  Alm<T> a2lme = almFromCl(Cle, fwhm);
   // Alm<T> a2lmb = almFromCl(Clb, fwhm);
-  Alm<T> a2lme(Cle, fwhm, rg_);
-  Alm<T> a2lmb(Clb, fwhm, rg_);
+  Alm<T> a2lme(Cle, fwhm, *rgp_);
+  Alm<T> a2lmb(Clb, fwhm, *rgp_);
 
   GenerateFromAlm(sphq,sphu,pixelSizeIndex,a2lme,a2lmb); 
@@ -1330 +1329 @@
 {
 
-  Alm<T> alm(Cl, fwhm, rg_);
+  Alm<T> alm(Cl, fwhm, *rgp_);
   GenerateFromAlm(sph,pixelSizeIndex, alm ); 
 }

trunk/SophyaLib/Samba/sphericaltransformserver.h

@@ -5 +5 @@
 #include "fftservintf.h"
 #include "fftpserver.h"
-#include "stsrand.h"
+#include "randinterf.h"
 #include "alm.h"
 #include "lambdaBuilder.h"
@@ -19 +19 @@
  public:
 
-  SphericalTransformServer();  
-  SphericalTransformServer(RandomGenerator const & rg);  
+  explicit SphericalTransformServer();  
+  explicit SphericalTransformServer(RandomGeneratorInterface& rg);  
   virtual ~SphericalTransformServer(); 
   void SetFFTServer(FFTServerInterface* srv=NULL);
@@ -107 +107 @@
 
  FFTServerInterface* fftIntfPtr_;
- mutable RandomGenerator rg_;
+ mutable RandomGeneratorInterface* rgp_;
 
 };

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_;
 };
 

trunk/SophyaProg/PrgMap/cl2map.cc

@@ -14 +14 @@
 #include "fitsspherehealpix.h"
 #include "fitstarray.h"
+
+#include "randr48.h"
 
 /*!
@@ -115 +117 @@
        << "' msph= " << msph << ") beam=" << beam*minute2rad << " rad" << endl;
   // on cree la carte 
-  RandomGenerator rg;
+  ThSDR48RandGen rg;
   if (fgair) {
     cout << " Setting random number generator seed (using time) " << endl; 

trunk/SophyaProg/Tests/tmtrnd.cc

@@ -28 +28 @@
 
 #include "srandgen.h"
-#include "stsrand.h"
 #include "randr48.h"
 
 
-// Choix du nom de la classe thread-safe a tests 
+// Choix du nom de la classe thread-safe a tester 
 #define TC_RandomGenerator ThSDR48RandGen
 

trunk/SophyaProg/Tests/tmtrnd3.cc

@@ -17 +17 @@
 #include "timing.h"
 
-#include "stsrand.h"
+#include "randr48.h"
 
 long Check_Redondances(TVector<r_8>& v);
@@ -55 +55 @@
   cout<<"MTRndTest::run() - Nom= "<<nom_<<" vv.Size()= "<<vv_.Size()
       <<" with threadsafe="<<thsafe_<<endl;
-  if(thsafe_) {  // On appele RandomGenerator Thread-Safe
-    RandomGenerator rgen(nbuff_,true);
+  if(thsafe_) {  // On appele ThSDR48RandGen Thread-Safe
+    ThSDR48RandGen rgen(nbuff_,true);
     for(sa_size_t k=0; k<vv_.Size(); k++) vv_(k) = rgen.Flat01();
-  } else {  // On appele RandomGenerator NO Thread-Safe
+  } else {  // On appele ThSDR48RandGen NO Thread-Safe
     // ATTENTION: le comportement est different selon qu'un thread
     // se termine avant ou apres que le suivant commence:
@@ -65 +65 @@
     // cela donne un comportement "tread_safe" APPARENT mais
     // dans la realite drand48() N'EST PAS thread_safe !!!!
-    RandomGenerator rgen(0,false);
+    ThSDR48RandGen rgen(0,false);
     for(sa_size_t k=0; k<vv_.Size(); k++) vv_(k) = rgen.Flat01();
   }
@@ -83 +83 @@
   if(NTH<=0) NTH = 1;
   cout<<"tmtrnd/arguments, VSZ= "<<VSZ<<" NTH= "<<NTH<<" NBUFF="<<NBUFF<<endl;
-  // Il ne faut pas que les buffers de RandomGenerator soient remplis
+  // Il ne faut pas que les buffers de ThSDR48RandGen soient remplis
   // au dela de ce qui est necessaire si on veut faire
   // la comparaison avec le mono thread
@@ -100 +100 @@
     //--- Init et set de l'aleatoire
     //---
-    RandomGenerator rgen_nothsf(0,false);
+    ThSDR48RandGen rgen_nothsf(0,false);
     unsigned short seed_16v[3];
     {
     cout<<"\n>>>>>>> Init de l'aleatoire"<<endl;
     rgen_nothsf.AutoInit(5);
-    rgen_nothsf.GetSeed(seed_16v,5);
+    rgen_nothsf.GetSeed(seed_16v);
     }
 
@@ -116 +116 @@
     {
     cout<<"\n>>>>>>> Remplissage en mono-thread avec drand48()"<<endl;
-    rgen_nothsf.Init(seed_16v,5);
+    rgen_nothsf.SetSeed(seed_16v);
     for(int i=0;i<VSZ;i++) DATA0(i) = drand48();
     PrtTim(" ");
@@ -122 +122 @@
 
     //---
-    //--- Remplissage par threads avec RandomGenerator thread safe
+    //--- Remplissage par threads avec ThSDR48RandGen thread safe
     //---
     TVector<r_8> DATA1(VSZ);
     {
-    cout<<"\n>>>>>>> Remplissage par threads avec RandomGenerator thread safe"<<endl;
-    rgen_nothsf.Init(seed_16v,5);
+    cout<<"\n>>>>>>> Remplissage par threads avec ThSDR48RandGen thread safe"<<endl;
+    rgen_nothsf.SetSeed(seed_16v);
     vector<MTRndTest *> vth1;
     cout<<"...tmtrnd/creating threads "<<endl;
@@ -147 +147 @@
 
     //---
-    //--- Remplissage par threads avec RandomGenerator SANS thread safe
+    //--- Remplissage par threads avec ThSDR48RandGen SANS thread safe
     //---
     TVector<r_8> DATA2(VSZ);
     {
-    cout<<"\n>>>>>>> Remplissage par threads avec RandomGenerator SANS thread safe"<<endl;
-    rgen_nothsf.Init(seed_16v,5);
+    cout<<"\n>>>>>>> Remplissage par threads avec ThSDR48RandGen SANS thread safe"<<endl;
+    rgen_nothsf.SetSeed(seed_16v);
     vector<MTRndTest *> vth2;
     cout << "......tmtrnd/creating threads " << endl;
@@ -172 +172 @@
 
     //---
-    //--- remplissage en mono-thread avec RandomGenerator
+    //--- remplissage en mono-thread avec ThSDR48RandGen
     //---
     TVector<r_8> DATA0R(VSZ);
     {
-    cout<<"\n>>>>>>> Remplissage en mono-thread avec RandomGenerator"<<endl;
-    rgen_nothsf.Init(seed_16v,5);
+    cout<<"\n>>>>>>> Remplissage en mono-thread avec ThSDR48RandGen"<<endl;
+    rgen_nothsf.SetSeed(seed_16v);
     for(int i=0;i<VSZ;i++) DATA0R(i) = rgen_nothsf.Flat01();
     PrtTim(" ");