Changeset 3613 in Sophya for trunk/SophyaLib/Samba

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/Samba

Files:

• alm.cc (modified) (3 diffs)
• alm.h (modified) (3 diffs)
• sphericaltransformserver.cc (modified) (5 diffs)
• sphericaltransformserver.h (modified) (3 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_;
 
 };