Changeset 2695 in Sophya for trunk/SophyaLib/BaseTools

Timestamp:

Apr 26, 2005, 6:20:21 PM (20 years ago)

Author:

ansari

Message:

1/ Declaration des classes PPF_TPointer_IO< X > avec X=int_1/2/4/8 r_4 ...
remis ds ppftpointerio.h - corps de fonction laisse ds .cc
2/ Ajout de la methode SwapOutBuffer() ds SwSegDataBlock<T>
3/ Ajout du constructeur par defaut ds PPFDataSwapper

Reza 26/4/2005

Location:

trunk/SophyaLib/BaseTools

Files:

• ppfswapper.h (modified) (1 diff)
• ppftpointerio.cc (modified) (2 diffs)
• ppftpointerio.h (modified) (1 diff)
• swsegdb.h (modified) (2 diffs)

trunk/SophyaLib/BaseTools/ppfswapper.h

@@ -23 +23 @@
 class PPFDataSwapper : public DataSwapperInterface<T> {
 public:
+  PPFDataSwapper() { ppfos = NULL; ppfis = NULL;}
   PPFDataSwapper(POutPersist & os) { ppfos = &os; ppfis = NULL;}
   PPFDataSwapper(PInPersist & is) { ppfos = NULL; ppfis = &is;}

trunk/SophyaLib/BaseTools/ppftpointerio.cc

@@ -102 +102 @@
 
 }  // namespace SOPHYA
+/*
 #ifdef __CXX_PRAGMA_TEMPLATES__
 #pragma define_template PPF_TPointer_IO< char >
@@ -133 +134 @@
 template class PPF_TPointer_IO< complex<r_8> >;
 #endif
-
+*/

trunk/SophyaLib/BaseTools/ppftpointerio.h

@@ -37 +37 @@
 };
 
+// declaration specifique pour ecriture sous forme de tableaux PPF
+class PPF_TPointer_IO<char> {
+public:
+  static void Write(POutPersist & os,  char  const * arr, size_t n);
+  static void Read(PInPersist & is, char * arr, size_t n);
+};
+
+class PPF_TPointer_IO<int_1> {
+public:
+  static void Write(POutPersist & os,  int_1  const * arr, size_t n);
+  static void Read(PInPersist & is, int_1 * arr, size_t n);
+};
+class PPF_TPointer_IO<uint_1> {
+public:
+  static void Write(POutPersist & os,  uint_1  const * arr, size_t n);
+  static void Read(PInPersist & is, uint_1 * arr, size_t n);
+};
+
+class PPF_TPointer_IO<int_2> {
+public:
+  static void Write(POutPersist & os,  int_2  const * arr, size_t n);
+  static void Read(PInPersist & is, int_2 * arr, size_t n);
+};
+class PPF_TPointer_IO<uint_2> {
+public:
+  static void Write(POutPersist & os,  uint_2  const * arr, size_t n);
+  static void Read(PInPersist & is, uint_2 * arr, size_t n);
+};
+
+class PPF_TPointer_IO<int_4> {
+public:
+  static void Write(POutPersist & os,  int_4  const * arr, size_t n);
+  static void Read(PInPersist & is, int_4 * arr, size_t n);
+};
+class PPF_TPointer_IO<uint_4> {
+public:
+  static void Write(POutPersist & os,  uint_4  const * arr, size_t n);
+  static void Read(PInPersist & is, uint_4 * arr, size_t n);
+};
+
+class PPF_TPointer_IO<int_8> {
+public:
+  static void Write(POutPersist & os,  int_8  const * arr, size_t n);
+  static void Read(PInPersist & is, int_8 * arr, size_t n);
+};
+class PPF_TPointer_IO<uint_8> {
+public:
+  static void Write(POutPersist & os,  uint_8  const * arr, size_t n);
+  static void Read(PInPersist & is, uint_8 * arr, size_t n);
+};
+
+class PPF_TPointer_IO<r_4> {
+public:
+  static void Write(POutPersist & os,  r_4  const * arr, size_t n);
+  static void Read(PInPersist & is, r_4 * arr, size_t n);
+};
+class PPF_TPointer_IO<r_8> {
+public:
+  static void Write(POutPersist & os,  r_8  const * arr, size_t n);
+  static void Read(PInPersist & is, r_8 * arr, size_t n);
+};
+
+class PPF_TPointer_IO< complex<r_4> > {
+public:
+  static void Write(POutPersist & os,  complex<r_4>  const * arr, size_t n);
+  static void Read(PInPersist & is, complex<r_4> * arr, size_t n);
+};
+class PPF_TPointer_IO< complex<r_8> > {
+public:
+  static void Write(POutPersist & os,  complex<r_8>  const * arr, size_t n);
+  static void Read(PInPersist & is, complex<r_8> * arr, size_t n);
+};
 
 }  // namespace SOPHYA

trunk/SophyaLib/BaseTools/swsegdb.h

@@ -120 +120 @@
     mSRef = a.mSRef;
     mSRef->nref++;
+    return *this;
   }
 
-  //! Return the position tag (swap position) table
-  std::vector< int_8 > & GetSwapPosTagTable() const 
-  { 
+  //! Empties all memory buffers to swap stream 
+  void SwapOutBuffer() const
+  {
     if ((mSRef->bidx >= 0) && !mSRef->fgcstbuff) {
       int_8 nswp = mSRef->swapper->WriteToSwap(mSRef->buff, mSRef->segsize, mSRef->bidx, 
@@ -130 +131 @@
       mSRef->swp[mSRef->bidx] = nswp;
       mSRef->fgwp[mSRef->bidx] = true;
-    }
+      mSRef->bidx = -1;
+      mSRef->fgcstbuff = true;  
+   }
+  }
+  //! Return the position tag (swap position) table, after call to SwapOutBuffer()
+  std::vector< int_8 > & GetSwapPosTagTable() const 
+  { 
+    SwapOutBuffer();
     return  mSRef->swp; 
   }