Changeset 2788 in Sophya

Timestamp:

May 30, 2005, 6:53:23 PM (20 years ago)

Author:

ansari

Message:

corrections pour impression/dump ascii des tableaux/matrices - Reza 30 Mai 2005

Location:

trunk/SophyaLib/TArray

Files:

• basarr.cc (modified) (1 diff)
• tarray.cc (modified) (2 diffs)
• tmatrix.cc (modified) (2 diffs)

trunk/SophyaLib/TArray/basarr.cc

@@ -532 +532 @@
 {
   if (ndim_ < 1) {
-    os << "\n--- " << BaseArray::InfoString() << " Unallocated Array ! " << endl;
+    os << "#--- " << BaseArray::InfoString() << " Unallocated Array ! " << endl;
     return;
   } 
-  os << "\n--- " << InfoString() ; 
+  os << "#--- " << InfoString() ; 
   os << " ND=" << ndim_ << " SizeX*Y*...= " ;
   for(int_4 k=0; k<ndim_; k++) { 

trunk/SophyaLib/TArray/tarray.cc

@@ -1296 +1296 @@
   \param si : if true,  display attached DvList
   \param ascd : if true, suppresses the display of line numbers,
-  suitable for ascii dump format.
+  suitable for ascii dump format. 
   \sa SetMaxPrint
   \sa WriteASCII
@@ -1326 +1326 @@
   sa_size_t k0,k1,k2,k3,k4;
   for(k4=0; k4<size_[4]; k4++) {
-    if ((size_[4] > 1) && ascd) 
-      cout << "\n ----- Dimension 5 (U) K4= " << k4 << endl;
+    if ((size_[4] > 1) && !ascd) 
+      os << "\n ----- Dimension 5 (U) K4= " << k4 << endl;
     for(k3=0; k3<size_[3]; k3++) {
-      if ((size_[3] > 1) && ascd) 
-        cout << "\n ----- Dimension 4 (T) K3= " << k3 << endl;
+      if ((size_[3] > 1) && !ascd) 
+        os << "\n ----- Dimension 4 (T) K3= " << k3 << endl;
       for(k2=0; k2<size_[2]; k2++) {
-        if ((size_[2] > 1) & ascd) 
-          cout << "\n ----- Dimension 3 (Z) K2= " << k2 << endl;
+        if ((size_[2] > 1) && !ascd) 
+          os << "\n ----- Dimension 3 (Z) K2= " << k2 << endl;
         for(k1=0; k1<size_[1]; k1++) {
-          if ( (size_[1] > 1) && (size_[0] > 10) && ascd) 
-            cout << "----- Dimension 2 (Y) K1= " << k1 << endl;
+          if ( (size_[1] > 1) && (size_[0] > 10) && !ascd) 
+            os << "----- Dimension 2 (Y) K1= " << k1 << endl;
           for(k0=0; k0<size_[0]; k0++) {
             if(k0 > 0) os << " ";  
             os << setw(prtw) << Elem(k0, k1, k2, k3, k4);     npr++;
-            if (npr >= (sa_size_t) maxprt) {
+            if (npr >= (sa_size_t) maxprt)  {
               if (npr < totsize_)  os << "\n     .... " << endl; return;
             }

trunk/SophyaLib/TArray/tmatrix.cc

@@ -1 @@
-// $Id: tmatrix.cc,v 1.31 2005-05-23 17:28:17 ansari Exp $
+// $Id: tmatrix.cc,v 1.32 2005-05-30 16:53:23 ansari Exp $
 //                         C.Magneville          04/99
 #include "sopnamsp.h"
@@ -394 +394 @@
   sa_size_t kc,kr;  
   for(kr=0; kr<size_[marowi_]; kr++) {
-    if ( (size_[marowi_] > 1) && (size_[macoli_] > 10) && ascd) cout << "----- Line= " << kr << endl;
+    if ( (size_[marowi_] > 1) && (size_[macoli_] > 10) && !ascd) 
+      os << "----- Line= " << kr << endl;
     for(kc=0; kc<size_[macoli_]; kc++) {
       if(kc > 0) os << " ";