Changeset 1550 in Sophya

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

Location:

trunk/SophyaLib/TArray

Files:

• basarr.h (modified) (1 diff)
• tarray.cc (modified) (4 diffs)
• tarray.h (modified) (1 diff)
• utilarr.cc (modified) (1 diff)
• utilarr.h (modified) (2 diffs)

trunk/SophyaLib/TArray/basarr.h

@@ -69 +69 @@
 
   // Array dimensions
+  //! Return true if the array was allocated ( Rank() > 0 )
+  inline bool IsAllocated() const { return( (ndim_ > 0) ? true : false ); }
   //! Return number of dimensions (array rank)
   inline int_4 NbDimensions() const { return( ndim_ ); }

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);
 }
 

trunk/SophyaLib/TArray/tarray.h

@@ -178 +178 @@
 // Impression, I/O, ...
   virtual string InfoString() const;   
-  virtual void   Print(ostream& os, int_4 maxprt=-1, bool si=false) const ;
+  virtual void   Print(ostream& os, sa_size_t maxprt=-1, 
+                       bool si=false, bool ascd=false) const ;
 
 // Lecture,Ecriture sur fichier ASCII

trunk/SophyaLib/TArray/utilarr.cc

@@ -144 +144 @@
 }
 
+EnumeratedSequence & EnumeratedSequence::Merge(EnumeratedSequence const & seq)
+{
+  for(int k=0; k<seq.vecv_.size(); k++) 
+    vecv_.push_back(seq.vecv_[k]);
+  return(*this);
+}
+
+void EnumeratedSequence::Print(ostream& os) const 
+{
+  os << " EnumeratedSequence::Print() - Size()= " << Size() << endl;
+  for(int k=0; k<vecv_.size(); k++) {
+    os << vecv_[k];
+    if ((k > 0) && (k%10 == 0))  os << endl;
+    else os << " " ;
+  }
+  return;
+}
+
+sa_size_t EnumeratedSequence::FillFromString(string const & str)
+{
+  cerr << " EnumeratedSequence::FillFromString() pas implemente !" << endl;
+  return (0);
+}
+
+sa_size_t EnumeratedSequence::FillFromFile(istream& is, 
+                                           sa_size_t& nr, sa_size_t& nc)
+{
+  cerr << " EnumeratedSequence::FillFromFile() pas implemente !" << endl;
+  return (0);
+}
+
 //////////////////////////////////////////////////////////
 /*!

trunk/SophyaLib/TArray/utilarr.h

@@ -88 +88 @@
 };
 
+//////////////////////////////////////////////////////////
+//! Class for creation and handling of an explicitly defined list of values
+
 class EnumeratedSequence : public Sequence  {
 public:
@@ -93 +96 @@
   virtual ~EnumeratedSequence();
   virtual MuTyV & Value(sa_size_t k) const ;
+
+  inline sa_size_t Size() const { return vecv_.size(); }
+
   EnumeratedSequence & operator , (MuTyV const & v);
   EnumeratedSequence & operator = (MuTyV const & v);
+
+  EnumeratedSequence & Merge(EnumeratedSequence const & seq);
+  inline  void         Clear()  { vecv_.clear(); }      
+  void                 Print(ostream& os) const;
+
+  sa_size_t            FillFromString(string const & str);
+  sa_size_t            FillFromFile(istream& is, sa_size_t& nr, sa_size_t& nc);
+
 private:
   vector<MuTyV> vecv_;
   mutable MuTyV retv_;
 };
+
+inline ostream& operator << (ostream& os, const EnumeratedSequence& a)
+                            { a.Print(os);    return(os);    }
 
   //inline EnumeratedSequence operator , (MuTyV const & a, MuTyV const & b)