Changeset 4051 in Sophya

Timestamp:

Feb 25, 2012, 10:40:10 PM (12 years ago)

Author:

ansari

Message:

modifs ds PPersist (classe PIOPersist) pour permettre l'enregistrement automatique (1ere lecture ou ecriture) de PPFWrapperSTLVector<T> (gestionnaire ppersist de std::vector<T> , Reza+cmv 25/02/2012

Location:

trunk/SophyaLib/BaseTools

Files:

• basetools.h (modified) (1 diff)
• ppersist.cc (modified) (1 diff)
• ppersist.h (modified) (2 diffs)
• ppfwrapstlv.h (modified) (2 diffs)

trunk/SophyaLib/BaseTools/basetools.h

@@ -22 +22 @@
 #include "srandgen.h"
 #include "datatype.h"
+#include "ppfwrapstlv.h"
 #include "randr48.h"
 #include "randfmt.h"
+#include "randtmt32.h"
+#include "randtmt64.h"
 
 #endif

trunk/SophyaLib/BaseTools/ppersist.cc

@@ -167 +167 @@
 }
 
+//! Return true if the specified PPersist class is found in the registered class list
+bool
+PIOPersist::checkPPClassId(PPersist const & ppo)
+{
+  string typ_name = typeid(ppo).name() ;
+  map<string, uint_8>::iterator i = ppclassNameList->find(typ_name);
+  if (i == ppclassNameList->end())   return false;
+  return true;
+}
 
 //! Returns the PPersist class name for the specified classId

trunk/SophyaLib/BaseTools/ppersist.h

@@ -46 +46 @@
 
     virtual void       Write(POutPersist&) const;
-    void               Read(PInPersist& s);               // Reads the type tag and the object
+    virtual void       Read(PInPersist& s);               // Reads the type tag and the object
     void               Write(POutPersist&, string const& tag) const; 
     void               ReadAtTag(PInPersist& s, string const& tag);
@@ -85 +85 @@
     static uint_8                getPPClassId(string const & typ_name);
     static uint_8                getPPClassId(PPersist const & ppo);
+    static bool                  checkPPClassId(PPersist const & ppo);
+
     static string                getDataObjClassName(uint_8 classId);
     static uint_8                getDataObjClassId(string const & typ_name);

trunk/SophyaLib/BaseTools/ppfwrapstlv.h

@@ -63 +63 @@
   inline operator std::vector<T>()  { return(*dobj); }
 
+  virtual void       Write(POutPersist& os) const
+  {
+    if (!PIOPersist::checkPPClassId(*this)) {  // on enregistre la classe 
+      PPRegister(PPFWrapperSTLVector< T >);
+      DObjRegister(PPFWrapperSTLVector< T >, std::vector< T >);
+    }
+    PPersist::Write(os);
+  }
+  virtual void       Read(PInPersist& os) 
+  {
+    if (!PIOPersist::checkPPClassId(*this)) {  // on enregistre la classe 
+      PPRegister(PPFWrapperSTLVector< T >);
+      DObjRegister(PPFWrapperSTLVector< T >, std::vector< T >);
+    }
+    PPersist::Read(os);
+  }
+
 protected :
   virtual void       ReadSelf(PInPersist& is)
@@ -73 +90 @@
     // On efface le contenu du vecteur si necessaire - (on peut faire plus efficacement ...)
     if ( dobj->size() > 0) dobj->erase(dobj->begin(), dobj->end());
-    T el;
     for(uint_8 k=0; k<itab[1]; k++) { 
+      T el;
       is >> el;
       dobj->push_back(el);