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

Timestamp:

Jul 2, 2001, 6:14:32 PM (24 years ago)

Author:

ansari

Message:

Suite implementation decodage ASCII ds EnumeratedSequence et TArray - Reza 2/7/2001

File:

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

trunk/SophyaLib/TArray/tarray.cc

@@ -1043 +1043 @@
 /*!
   \param is : input stream (ASCII)
- */
-template <class T>
-void TArray<T>::ReadASCII(istream& is)
+  \param nr : Number of non empty (or comment) lines in stream (return value)
+  \param nc : Number of columns (= ntot/nlines) (return value)
+  \return Number of decoded elements
+ */
+template <class T>
+sa_size_t TArray<T>::ReadASCII(istream& is, sa_size_t & nr, sa_size_t & nc)
 {
   EnumeratedSequence es;
-  sa_size_t nr, nc;
-  es.FillFromFile(is, nr, nc);
+  sa_size_t n = es.FillFromFile(is, nr, nc);
+  if ( (n < 1) || (nr < 1) || (nc < 1) ) return(n); 
+  if (!IsAllocated()) {
+    sa_size_t sz[2];
+    if (arrtype_ == 2) { // C'est un vecteur 
+      sz[0] = sz[1] = 1;
+      sz[veceli_] = n;
+    }
+    else {
+      sz[RowsKA()] = nr;
+      sz[ColsKA()] = nc;
+    }
+    ReSize(2, sz);
+  }
+  SetSeq(es);
+  cout << "TArray<T>::ReadASCII()/Info: " << n << " elements read from stream " 
+       << " (Row,Col= " << nr << "," << nc << ")" << endl;
+  return(n);
 }
 
@@ -1055 +1074 @@
 /*!
   \param os : output stream (ASCII)
+  \sa Print
  */
 template <class T>