Changeset 1550 in Sophya for trunk/SophyaLib/TArray/tarray.cc

Timestamp:

Jun 27, 2001, 10:13:16 AM (24 years ago)

Author:

ansari

Message:

Extension de l'interface TArray/BaseArray/EnumeratedSequence pour permettre la lecture de fichier ASCII - Reza 27/6/2001

File:

• trunk/SophyaLib/TArray/tarray.cc (modified) (4 diffs)

trunk/SophyaLib/TArray/tarray.cc

@@ -1000 +1000 @@
   \param maxprt : maximum numer of print
   \param si : if true,  display attached DvList
+  \param ascd : if true, suppresses the display of line numbers,
+  suitable for ascii dump format.
   \sa SetMaxPrint
- */
-template <class T>
-void TArray<T>::Print(ostream& os, int_4 maxprt, bool si) const
+  \sa WriteASCII
+ */
+template <class T>
+void TArray<T>::Print(ostream& os, sa_size_t maxprt, bool si, bool ascd) const
 {
   if (maxprt < 0)  maxprt = max_nprt_;
@@ -1011 +1014 @@
   sa_size_t k0,k1,k2,k3,k4;
   for(k4=0; k4<size_[4]; k4++) {
-    if (size_[4] > 1) cout << "\n ----- Dimension 5 (U) K4= " << k4 << endl;
+    if ((size_[4] > 1) && ascd) 
+      cout << "\n ----- Dimension 5 (U) K4= " << k4 << endl;
     for(k3=0; k3<size_[3]; k3++) {
-      if (size_[3] > 1) cout << "\n ----- Dimension 4 (T) K3= " << k3 << endl;
+      if ((size_[3] > 1) && ascd) 
+        cout << "\n ----- Dimension 4 (T) K3= " << k3 << endl;
       for(k2=0; k2<size_[2]; k2++) {
-        if (size_[2] > 1) cout << "\n ----- Dimension 3 (Z) K2= " << k2 << endl;
+        if ((size_[2] > 1) & ascd) 
+          cout << "\n ----- Dimension 3 (Z) K2= " << k2 << endl;
         for(k1=0; k1<size_[1]; k1++) {
-          if ( (size_[1] > 1) && (size_[0] > 10) ) cout << "----- Dimension 2 (Y) K1= " << k1 << endl;
+          if ( (size_[1] > 1) && (size_[0] > 10) && ascd) 
+            cout << "----- Dimension 2 (Y) K1= " << k1 << endl;
           for(k0=0; k0<size_[0]; k0++) {
-            if(k0 > 0) os << ", ";  
+            if(k0 > 0) os << " ";  
             os << Elem(k0, k1, k2, k3, k4);     npr++;
             if (npr >= (sa_size_t) maxprt) {
@@ -1040 +1047 @@
 void TArray<T>::ReadASCII(istream& is)
 {
-  cerr << " TArray<T>::ReadASCII() - Pas encore implemente - Reza 12/6/2001 " << endl;
+  EnumeratedSequence es;
+  sa_size_t nr, nc;
+  es.FillFromFile(is, nr, nc);
 }
 
@@ -1050 +1059 @@
 void TArray<T>::WriteASCII(ostream& os) const
 {
-  Print(os, Size(), true);
+  Print(os, Size(), false, true);
 }