Changeset 3620 in Sophya

Timestamp:

May 6, 2009, 5:36:40 PM (16 years ago)

Author:

ansari

Message:

les includes dSFMT.h ... mis ds le fichier randfmt.cc uniquement, declaration d'un pointeur dsfmt_t au lieu de la structure - Reza 06/06/2009

Location:

trunk/SophyaLib/BaseTools

Files:

• randfmt.cc (modified) (7 diffs)
• randfmt.h (modified) (2 diffs)

trunk/SophyaLib/BaseTools/randfmt.cc

@@ -3 +3 @@
 
 #include "randfmt.h"
+#include "dsfmtflags.h"
+#include "dSFMT.h"
 
 namespace SOPHYA {
@@ -14 +16 @@
 FMTRandGen::FMTRandGen(uint_4 seed)
 {
-  dsfmt_init_gen_rand(&dsfmt_,seed);
+  // On est oblige de faire new car la structure ds_fmt_t pas defini ds randfmt.h 
+  dsfmt_ptr_ = new dsfmt_t;
+  dsfmt_init_gen_rand(dsfmt_ptr_,seed);
 }
 
 FMTRandGen::~FMTRandGen()
 {
+// Ne pas oublier de faire le delete 
+  delete dsfmt_ptr_;
 }
 
@@ -28 +34 @@
 void FMTRandGen::SetSeed(uint_4 seed)
 {
-  dsfmt_init_gen_rand(&dsfmt_,seed);
+  dsfmt_init_gen_rand(dsfmt_ptr_,seed);
 }
 
@@ -38 +44 @@
   for(int i=0;i<key_length;i++) init_key[i] = seed[i];
 
-  dsfmt_init_by_array(&dsfmt_,init_key,key_length);
+  dsfmt_init_by_array(dsfmt_ptr_,init_key,key_length);
 
   delete [] init_key;
@@ -45 +51 @@
 r_8 FMTRandGen::Next()
 {
-  return dsfmt_genrand_close_open(&dsfmt_);
+  return dsfmt_genrand_close_open(dsfmt_ptr_);
 }
 
@@ -73 +79 @@
     throw NullPtrError("ObjFileIO<FMTRandGen>::WriteSelf() dobj=NULL");
   s.Put((uint_4)DSFMT_MEXP);
-  s.Put(dobj->dsfmt_.idx);
+  s.Put(dobj->dsfmt_ptr_->idx);
   for(int i=0;i<DSFMT_N+1;i++) {
     for(int j=0;j<2;j++) {
-      uint_8 v = dobj->dsfmt_.status[i].u[j];
+      uint_8 v = dobj->dsfmt_ptr_->status[i].u[j];
       s.PutU8(v);
     }
@@ -92 +98 @@
     throw SzMismatchError("ObjFileIO<FMTRandGen>::WriteSelf() wrong DSFMT_MEXP");
   if(dobj == NULL) dobj = new FMTRandGen();
-  s.Get(dobj->dsfmt_.idx);
+  s.Get(dobj->dsfmt_ptr_->idx);
   for(int i=0;i<DSFMT_N+1;i++) {
     for(int j=0;j<2;j++) {
       uint_8 v;
       s.Get(v);
-      dobj->dsfmt_.status[i].u[j] = v;
+      dobj->dsfmt_ptr_->status[i].u[j] = v;
     }
   }

trunk/SophyaLib/BaseTools/randfmt.h

@@ -12 +12 @@
 #include "objfio.h"
 
-#include "dsfmtflags.h"
-#include "dSFMT.h"
 #include "randinterf.h"
 
 #include <vector>
+
+//--- Declaration de la struct definie ds dSFMT.h - inclus uniquement dans le .cc  
+struct DSFMT_T ; 
+typedef struct DSFMT_T dsfmt_t;
+//------------------- 
 
 namespace SOPHYA {
@@ -36 +39 @@
  protected:
   virtual r_8 Next();
-  dsfmt_t dsfmt_;
+  dsfmt_t* dsfmt_ptr_;   // Pointeur car dsfmt_t pas encore defini
 
 };