Changeset 2699 in Sophya for trunk/SophyaLib/HiStats/swppfdtable.cc

Timestamp:

Apr 27, 2005, 1:48:19 PM (20 years ago)

Author:

ansari

Message:

1/ Corrections diverses ds BaseDataTable, en particulier GetSegment() -> GetCstSegment(), et ameliorations/debug divers
2/ Classe SWPPFDataTable debugge, rendu +/- operationnelle
3/ Gestionnaire PPersist de DataTable et SWPPFDataTable fusionnee en une seule
classe ObjFileIO<BaseDataTable> - mis ds fio_dtable.cc
4/ mis a jour histats.h avec swppfdtable.h, objlist.list et histinit.cc

Reza, 27 Avril 2005

File:

• trunk/SophyaLib/HiStats/swppfdtable.cc (modified) (5 diffs)

trunk/SophyaLib/HiStats/swppfdtable.cc

@@ -46 +46 @@
 SwPPFDataTable::SwPPFDataTable(POutPersist & os, sa_size_t segsz)
   : BaseDataTable(segsz) ,
-    mISwapper(os), mLSwapper(os), mFSwapper(os), mDSwapper(os), mSSwapper(os),
-    mSwOut(&os), mSwIn(NULL)
+    mSwOut(&os), mSwIn(NULL),
+    mISwapper(os), mLSwapper(os), mFSwapper(os), mDSwapper(os), mSSwapper(os)
 {
 }
@@ -53 +53 @@
 SwPPFDataTable::SwPPFDataTable(PInPersist & is, sa_size_t segsz)
   : BaseDataTable(segsz) ,
-    mISwapper(is), mLSwapper(is), mFSwapper(is), mDSwapper(is), mSSwapper(is),
-    mSwOut(NULL), mSwIn(&is)
-{
+    mSwOut(NULL), mSwIn(NULL)
+{
+  PInPersist* pis = new PInPersist(is.FileName(), false);
+  mSwIn = new St_InSwap;
+  mSwIn->pis = pis;  mSwIn->refcnt = 1;
+  mISwapper.SetInStream(*pis);
+  mLSwapper.SetInStream(*pis);
+  mFSwapper.SetInStream(*pis);
+  mDSwapper.SetInStream(*pis);
+  mDSwapper.SetInStream(*pis);
 }
 
@@ -64 +71 @@
 {
   Share(a);
+}
+//! Destructor - Deletes / closes the input PPF swap stream  
+SwPPFDataTable::~SwPPFDataTable()
+{
+  if (mSwIn) { 
+    mSwIn->refcnt--;
+    if (mSwIn->refcnt == 0) {
+      delete mSwIn->pis;
+      delete mSwIn;
+      mSwIn = NULL;
+    }
+  }
 }
 
@@ -77 +96 @@
   mSwOut = a.mSwOut;
   mSwIn = a.mSwIn;
+  if (mSwIn)  mSwIn->refcnt++;  // comptage de reference pour le stream input 
 
   // On recopie la taille de segment
@@ -277 +297 @@
 }
 
-/*!
-   \class SOPHYA::ObjFileIO<SwPPFDataTable>
-   \ingroup HiStats
-   Persistence (serialisation) handler for class SwPPFDataTable
-*/
-/* --Methode-- */ 
-DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
-void   ObjFileIO<SwPPFDataTable>::WriteSelf(POutPersist& s)  const
-//      Serialisation en ecriture du SwPPFDataTable sur stream PPF
-{
-  if (dobj == NULL)   
-    throw NullPtrError("ObjFileIO<SwPPFDataTable>::WriteSelf() NULL dobj pointer ");
-  if (dobj->mSwOut != &s) 
-    throw NotAvailableOperation("ObjFileIO<SwPPFDataTable>::WriteSelf() OutputStream <> SwapStream");
-  //-------  On ecrit 3 uint_4 .... 
-  //  [0]: Numero de version ;
-  //  [1] : bit1 non nul -> has info  
-  //  [2] : reserve
-  uint_4 itab[3];
-  itab[0] = 1;  // Numero de version a 1
-  itab[1] = itab[2] = 0;
-  if (dobj->mInfo)  itab[1] = 1;
-  s.Put(itab, 3);
-
-  //-------- Ecriture de segment size, nb de colonnes, nb de lignes ...  
-  // [0] : SegmentSize()        [1] : NVar()
-  // [2] : NEntry()             [3] : NbSegments()
-  uint_8 ltab[5];
-  ltab[0] = dobj->SegmentSize();
-  ltab[1] = dobj->NVar();
-  ltab[2] = dobj->NEntry();
-  ltab[3] = dobj->NbSegments();
-  ltab[4] = 0;
-  s.Put(ltab, 5);
-
-  //------ Ecriture du nom et type des colonnes
-  for(sa_size_t k=0; k<dobj->NVar(); k++) { 
-    uint_2 typ = dobj->mNames[k].type;
-    s.Put(typ);
-    s.Put(dobj->mNames[k].nom);
-  }
-  // ------- Ecriture des tableaux min,max et n_minmax
-  for(uint_8 k=0; k<ltab[1]; k++) { 
-    s.Put(dobj->mMin[k]);
-    s.Put(dobj->mMax[k]);
-    s.Put(dobj->mMinMaxNEnt[k]);
-  }  
-  //------- Ecriture du DVList Info() associe, si existant
-  if (dobj->mInfo)  s << (*(dobj->mInfo));
-
-  //------- Ecriture des tables de positionnement de SwSegDataBlock<T> 
-  for (size_t kk=0; kk<dobj->mNames.size(); kk++) {
-    sa_size_t sk = dobj->mNames[kk].ser;
-    switch (dobj->mNames[kk].type) {
-    case BaseDataTable::IntegerField :
-      s.PutPosTagTable(dobj->mICols[sk].GetSwapPosTagTable()); 
-      break;
-    case BaseDataTable::LongField :
-      s.PutPosTagTable(dobj->mLCols[sk].GetSwapPosTagTable()); 
-      break;
-    case BaseDataTable::FloatField :
-      s.PutPosTagTable(dobj->mFCols[sk].GetSwapPosTagTable()); 
-      break;
-    case BaseDataTable::DoubleField :
-      s.PutPosTagTable(dobj->mDCols[sk].GetSwapPosTagTable()); 
-      break;
-    case BaseDataTable::StringField :
-      s.PutPosTagTable(dobj->mSCols[sk].GetSwapPosTagTable()); 
-      break;
-    default:
-      throw ForbiddenError("ObjFileIO<SwPPFDataTable>::WriteSelf() : unknown column type ");
-    break;
-    }
-  }    
-  return;
-}
-
-/* --Methode-- */
-DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
-void  ObjFileIO<SwPPFDataTable>::ReadSelf(PInPersist& s)
-//      Serialisation en lecture du SwPPFDataTable sur stream PPF
-{
-  // ------- On lit les 3 premiers uint_4
-  //  [0]: Numero de version ;
-  //  [1] : bit1 non nul -> has info  
-  //  [2] : reserve
-  uint_4 itab[3] = {0,0,0};
-  s.Get(itab, 3);
-  bool hadinfo = false;
-  if ((itab[1]&1) == 1)  hadinfo = true;
-
-  // -------- Lecture de segment size, nb de colonnes, nb de lignes ...  
-  // [0] : SegmentSize()        [1] : NVar()
-  // [2] : NEntry()             [3] : NbSegments()
-  uint_8 ltab[5] = {0,0,0,0,0};
-  s.Get(ltab, 5);
-  if (dobj == NULL) dobj = new SwPPFDataTable(s, ltab[0]);
-  else { 
-    // Copie brutale en utilisant l'operateur = 
-     *dobj = SwPPFDataTable(s, ltab[0]);
-  }
-  // -------- Lecture nom/type colonnes et allocation des colonnes
-  uint_2 typ; 
-  string cnom;
-  for(uint_8 k=0; k<ltab[1]; k++) { 
-    s.Get(typ);
-    s.Get(cnom);
-    BaseDataTable::FieldType ft = (BaseDataTable::FieldType)typ;
-    dobj->AddColumn(ft, cnom);
-  }
-  // ------- Lecture des tableaux min,max et n_minmax
-  for(uint_8 k=0; k<ltab[1]; k++) { 
-    s.Get(dobj->mMin[k]);
-    s.Get(dobj->mMax[k]);
-    s.Get(dobj->mMinMaxNEnt[k]);
-  }  
-  // ------- Lecture du DVList Info() associe, si necessaire
-  if (hadinfo) {    // Lecture eventuelle du DVList Info
-    if (dobj->mInfo == NULL)  dobj->mInfo = new DVList;
-    s >> (*(dobj->mInfo));
-  }
-  // ------- Mise a jour des champs Nb d'entrees, nb segments ...
-  dobj->mNEnt = ltab[2];
-  dobj->mNSeg = ltab[3];
-  cout << " DEBUG___ SegmentSize()= " << dobj->SegmentSize() << endl;
-  // ------- Lecture des tag de positionnement des SwSegDataBlock<T> 
-  vector<int_8> swpos;
-  for (size_t kk=0; kk<dobj->mNames.size(); kk++) {
-    sa_size_t sk = dobj->mNames[kk].ser;
-    switch (dobj->mNames[kk].type) {
-    case BaseDataTable::IntegerField :
-      swpos.clear();
-      s.GetPosTagTable(swpos);
-      dobj->mICols[sk] = SwSegDataBlock<int_4>(dobj->mISwapper, swpos, dobj->SegmentSize());
-    break;
-    case BaseDataTable::LongField :
-      swpos.clear();
-      s.GetPosTagTable(swpos);
-      dobj->mLCols[sk] = SwSegDataBlock<int_8>(dobj->mLSwapper, swpos, dobj->SegmentSize());
-      break;
-    case BaseDataTable::FloatField :
-      swpos.clear();
-      s.GetPosTagTable(swpos);
-      dobj->mFCols[sk] = SwSegDataBlock<r_4>(dobj->mFSwapper, swpos, dobj->SegmentSize());
-      break;
-    case BaseDataTable::DoubleField :
-      swpos.clear();
-      s.GetPosTagTable(swpos);
-      dobj->mDCols[sk] = SwSegDataBlock<r_8>(dobj->mDSwapper, swpos, dobj->SegmentSize());
-      break;
-    case BaseDataTable::StringField :
-      swpos.clear();
-      s.GetPosTagTable(swpos);
-      dobj->mSCols[sk] = SwSegDataBlock<string>(dobj->mSSwapper, swpos, dobj->SegmentSize());
-      break;
-    default:
-      throw ForbiddenError("ObjFileIO<SwPPFDataTable>::ReadSelf() : unknown column type ");
-    break;
-    }
-  }    
-return;
-}
-
-#ifdef __CXX_PRAGMA_TEMPLATES__
-#pragma define_template ObjFileIO<SwPPFDataTable>
-#endif
-
-#if defined(ANSI_TEMPLATES) || defined(GNU_TEMPLATES)
-template class ObjFileIO<SwPPFDataTable>;
-#endif