Changeset 1103 in Sophya for trunk/SophyaLib/TArray/basarr.cc

Timestamp:

Jul 27, 2000, 2:00:10 AM (25 years ago)

Author:

ansari

Message:

Suite operations entre matrices de <> MemOrg, Amelioration des Sequences - Reza 27/7/2000

File:

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

trunk/SophyaLib/TArray/basarr.cc

@@ -301 +301 @@
   else {
     smo = false;
-    if ( (size_[marowi_] != a.size_[marowi_]) || 
-         (size_[macoli_] != a.size_[macoli_])  ) return(false);
+    if ( (size_[marowi_] != a.size_[a.marowi_]) || 
+         (size_[macoli_] != a.size_[a.macoli_])  ) return(false);
+    if (ndim_ > 2)  
+      for(uint_4 k=2; k<ndim_; k++) 
+        if (size_[k] != a.size_[k])  return(false);
     if ( (macoli_ == a.macoli_) && (marowi_ == a.marowi_) ||
          (veceli_ == a.veceli_) )  smo = true;
@@ -353 +356 @@
 int  BaseArray::MinStepKA() const
 {
-  for(int ka=0; ka<ndim_; ka++)
-    if (step_[ka] == minstep_) return(ka);
+  for(uint_4 ka=0; ka<ndim_; ka++)
+    if (step_[ka] == minstep_) return((int)ka);
   return(0);
 }
@@ -363 +366 @@
   int ka = 0;
   uint_4 mx = size_[0];
-  for(int k=0; k<ndim_; k++)  
+  for(uint_4 k=1; k<ndim_; k++)  
     if (size_[k] > mx) {  ka = k;  mx = size_[k]; } 
   return(ka);
@@ -475 +478 @@
     os << " MemoryMapping=" << GetMemoryMapping() << " VecType= " << GetVectorType()
        << " RowsKA= " << RowsKA() << " ColsKA= " << ColsKA() 
-       << " VectKA=" << VectKA() << endl;
+       << " VectKA=" << VectKA() << " ArrayType=" << arrtype_ << endl;
   }
   if (!si && (prt_lev_ < 2)) return;