Changeset 3889 in Sophya

Timestamp:

Sep 27, 2010, 11:24:10 PM (15 years ago)

Author:

ansari

Message:

correction bug SetSeed() ds ThSDR48RandGen + retag en V2_2, Reza 27/09/2010

Location:

trunk/SophyaLib/BaseTools

Files:

• randr48.cc (modified) (6 diffs)
• randr48.h (modified) (1 diff)
• stsrand.cc (modified) (2 diffs)

trunk/SophyaLib/BaseTools/randr48.cc

@@ -45 +45 @@
 }
 
+/*! 
+  \brief Initialize the state of the random generator object using the integer value argument
+
+  \warning This method changes the global random generator drand48() state
+*/
 void DR48RandGen::SetSeed(long int  seed)
 {
@@ -50 +55 @@
 }
 
+/*! 
+  \brief Initialize the state of the random generator object using the short integer array
+
+  \warning This method changes the global random generator drand48() state
+*/
 void DR48RandGen::SetSeed(uint_2 seed[3])
 {
   seed48(seed);
 }
+
+//! Return the random generator state 
 void DR48RandGen::GetSeed(uint_2 seed[3])
 {
@@ -68 +80 @@
 }
 
+/*! 
+  \brief Random Initialization of the state of the random generator object using the system clock
+
+  \warning This method changes the global random generator drand48() state
+*/
 void DR48RandGen::AutoInit(int lp)
 {
@@ -185 +202 @@
 }
 
+/*! 
+  \brief Initialize the state of the random generator object using the integer value argument
+
+  \warning This method changes the global random generator drand48() state
+*/
 void ThSDR48RandGen::SetSeed(long int seed)
 {
@@ -190 +212 @@
   ths_rand->lock();
   DR48RandGen::SetSeed(seed);
+  if(!fg_nothrsafe) idx_ = rseq_.Size();
   ths_rand->unlock();
   return;
 }
 
+/*! 
+  \brief Initialize the state of the random generator object using the short integer array
+
+  \warning This method changes the global random generator drand48() state
+*/
 void ThSDR48RandGen::SetSeed(uint_2 seed[3])
 {
   if (ths_rand == NULL)  ths_rand = new ThSafeOp; 
   ths_rand->lock();
-  SetSeed_P(seed);
+  DR48RandGen::SetSeed(seed);
+  if(!fg_nothrsafe) idx_ = rseq_.Size();
   ths_rand->unlock();
 }
 
+//! Return the random generator state 
 void ThSDR48RandGen::GetSeed(uint_2 seed[3])
 {
   if (ths_rand == NULL)  ths_rand = new ThSafeOp; 
   ths_rand->lock();
-  GetSeed_P(seed);
+  DR48RandGen::GetSeed(seed);
   ths_rand->unlock();
   return;
 }
 
-void ThSDR48RandGen::SetSeed_P(uint_2 seed[3])
-{
-  DR48RandGen::SetSeed(seed);
-}
-
-void ThSDR48RandGen::GetSeed_P(uint_2 seed[3])
-{
-  DR48RandGen::GetSeed(seed);
-}
-
+
+/*! 
+  \brief Random Initialization of the state of the random generator object using the system clock
+
+  \warning This method changes the global random generator drand48() state
+*/
 void ThSDR48RandGen::AutoInit(int lp)
 {
@@ -245 +271 @@
     return(rseq_(idx_++));
   }
+}
+
+void ThSDR48RandGen::GetSeed_P(uint_2 seed[3])
+{
+  return DR48RandGen::GetSeed(seed);
 }
 

trunk/SophyaLib/BaseTools/randr48.h

@@ -70 +70 @@
   virtual r_8 Next();
 
-  // Non thread-safe version of Init() and GetSeed()
-  void SetSeed_P(uint_2 seed[3]);
-  void GetSeed_P(uint_2 seed[3]);
+  virtual void GetSeed_P(uint_2 seed[3]);  // Pour utilisation par PPF handler 
 
 };

trunk/SophyaLib/BaseTools/stsrand.cc

@@ -14 +14 @@
    \brief Random number generator
 
+   \warning This class is OBSOLETE. Use ThSDR48RandGen instead.
    This class is a thread-safe random number generator.
    Its PPF handler can be used to save the complete state of the class and the underlying
@@ -32 +33 @@
 STSRandGen::STSRandGen(size_t n, bool tsafe) 
 {
+  cout << " STSRandGen::STSRandGen()/Warning : this class is OBSOLETE. Use ThSDR48RandGen !" << endl;
+  cout << " STSRandGen::STSRandGen()/Warning : this class is OBSOLETE. Use ThSDR48RandGen !" << endl;
+
   if (ths_rand == NULL)  ths_rand = new ThSafeOp; 
   if (tsafe) {   // thread-safe