Changeset 810 in Sophya

Timestamp:

Apr 3, 2000, 7:46:32 PM (25 years ago)

Author:

ercodmgr

Message:

Adaptation modifs TArray<T>,PPersist - Reza 03/04/2000

Location:

trunk/SophyaPI/PIext

Files:

• nomskymapadapter.cc (modified) (1 diff)
• nomtmatvecadapter.cc (modified) (2 diffs)
• pawexecut.cc (modified) (1 diff)

trunk/SophyaPI/PIext/nomskymapadapter.cc

@@ -173 +173 @@
   int_4 nl = mtx.NRows();
   int_4 nc = mtx.NCols();
-  mtx.Reset(defval);   // On met tout a defval
+  mtx.DataBlock().Reset(defval);   // On met tout a defval
 //  cout << " NRows= " << nl << "  NCols= " << nc  << endl;
   for(l=0; l<nl; l++) {

trunk/SophyaPI/PIext/nomtmatvecadapter.cc

@@ -11 +11 @@
 #include "pitvmaad.h"
 
+#include "fioarr.h"
 
 
@@ -59 +60 @@
 TVector<T>* v = dynamic_cast<TVector<T> *>(mMtx);
 if (v != NULL) {
-  FIO_TVector<T> fio(v);
+  FIO_TArray<T> fio(v);
   fio.Write(pos, nom);
   }
 else {
-  FIO_TMatrix<T> fio(mMtx);
+  FIO_TArray<T> fio(mMtx);
   fio.Write(pos, nom);
   }

trunk/SophyaPI/PIext/pawexecut.cc

@@ -145 +145 @@
 else if(typeid(*mobj)==typeid(Matrix))  {Matrix*  ob=(Matrix*) mobj; ob->Zero();}
 #else
-if(typeid(*mobj)==typeid(Vector))       {Vector*  ob=(Vector*) mobj; ob->Reset(0.);}
-else if(typeid(*mobj)==typeid(Matrix))  {Matrix*  ob=(Matrix*) mobj; ob->Reset(0.);}
+if(typeid(*mobj)==typeid(Vector))       {Vector*  ob=(Vector*) mobj; ob->DataBlock().Reset(0.);}
+else if(typeid(*mobj)==typeid(Matrix))  {Matrix*  ob=(Matrix*) mobj; ob->DataBlock().Reset(0.);}
 #endif
 else if(typeid(*mobj)==typeid(Histo))   {Histo*   ob=(Histo*)  mobj; ob->Zero();}