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

Timestamp:

Jul 26, 2000, 6:29:46 PM (25 years ago)

Author:

ansari

Message:

Protection integrite TMatrix,TVector - operateur = (BaseArray & pour TVector et operations entre matrices avec <> MemMapping (Pas termine) Reza 27/6/2000

File:

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

trunk/SophyaLib/TArray/basarr.cc

@@ -164 +164 @@
   }
   else veceli_ = (vt ==  ColumnVector ) ?  marowi_ : macoli_;
-  ck_memo_vt_ = true;   // Check MemMapping and VectorType for CompareSize  
 }
 
@@ -196 +195 @@
   }
   else veceli_ = (vt ==  ColumnVector ) ?  marowi_ : macoli_;
-  ck_memo_vt_ = true;   // Check MemMapping and VectorType for CompareSize  
 }
 
@@ -224 +222 @@
   }
   else   veceli_ = (vt ==  ColumnVector ) ?  marowi_ : macoli_;
-  ck_memo_vt_ = true;   // Check MemMapping and VectorType for CompareSize  
 }
 
@@ -243 +240 @@
   }
   else  veceli_ = (vt ==  ColumnVector ) ?  marowi_ : macoli_;
-  ck_memo_vt_ = true;   // Check MemMapping and VectorType for CompareSize  
 }
 
@@ -268 +264 @@
   }
   veceli_ = (default_vector_type ==  ColumnVector ) ?  marowi_ : macoli_;
-  ck_memo_vt_ = false;   // Default : Don't Check MemMapping and VectorType for CompareSize  
+  arrtype_ = 0;    // Default Array type, not a Matrix or Vector
+  
 }
 
@@ -277 +274 @@
 
 
-//! Returns true if dimension and sizes are equal
+//! Returns true if the two arrays have compatible dimensions.
 /*!
   \param a : array to be compared
-  \return true if ndim and sizes[ndim] are equal, false if not
+  \param smo : Return flag = true if the two arrays have the same memory organisation
+  \return true if \c NbDimensions() and \c Size() are equal, false if not
+
+  If the array (on which the operation is being performed, \c this) 
+  is a \b Matrix or a \b Vector, the matrix dimensions \c NRows() \c NCols()
+  are checked. The flag \c smo is returned true if the two arrays, viewed 
+  as a matrix have the same memory organisation.
+  Otherwise, (if the array is of not a Matrix or a Vector) 
+  the size compatibility viewed as a TArray is checked <tt> 
+  (Size(k) == a.Size(k), k=0,...NbDimensions()), </tt> disregard of the memory 
+  organisation and the row and column index. The flag \c smo is returned true 
+  in this case.
 */
-bool BaseArray::CompareSizes(const BaseArray& a)
+bool BaseArray::CompareSizes(const BaseArray& a, bool& smo)
 {
   if (ndim_ != a.ndim_)  return(false);
-  for(uint_4 k=0; k<ndim_; k++) 
-    if (size_[k] != a.size_[k])  return(false);
-  //  $CHECK$   Reza doit-on verifier ca 
-  if (ck_memo_vt_ && a.ck_memo_vt_)
-    if ( (macoli_ != a.macoli_) || (marowi_ != a.marowi_) ||
-         (veceli_ != a.veceli_) )  return(false);
-  return(true);
+  if (arrtype_ == 0) {  // Simple TArray, not a matrix 
+    smo = true;
+    for(uint_4 k=0; k<ndim_; k++) 
+      if (size_[k] != a.size_[k])  return(false);
+    return(true);
+  }
+  else {
+    smo = false;
+    if ( (size_[marowi_] != a.size_[marowi_]) || 
+         (size_[macoli_] != a.size_[macoli_])  ) return(false);
+    if ( (macoli_ == a.macoli_) && (marowi_ == a.marowi_) ||
+         (veceli_ == a.veceli_) )  smo = true;
+    return(true);
+  }
 }
 
@@ -336 +351 @@
 
 //! return minimum value for step[ndim]
-uint_4 BaseArray::MinStepKA() const
-{
-  for(uint_4 ka=0; ka<ndim_; ka++)
+int  BaseArray::MinStepKA() const
+{
+  for(int ka=0; ka<ndim_; ka++)
     if (step_[ka] == minstep_) return(ka);
   return(0);
@@ -344 +359 @@
 
 //! return maximum value for step[ndim]
-uint_4 BaseArray::MaxSizeKA() const
-{
-  uint_4 ka = 0;
+int  BaseArray::MaxSizeKA() const
+{
+  int ka = 0;
   uint_4 mx = size_[0];
-  for(uint_4 k=0; k<ndim_; k++)  
-    if (size_[k] > mx) {  ka = k;  mx = size_[k];  }
+  for(int k=0; k<ndim_; k++)  
+    if (size_[k] > mx) {  ka = k;  mx = size_[k]; } 
   return(ka);
 }
@@ -410 +425 @@
 }
 
+//! return various parameters for double loop operations on two arrays.
+void BaseArray::GetOpeParams(const BaseArray& a, bool smo, int& ax, int& axa, uint_8& step,
+                             uint_8& stepa, uint_8& gpas, uint_8& naxa)
+{
+  if (smo) { // Same memory organisation
+    ax = axa = MaxSizeKA();
+  }
+  else {
+    if (Size(RowsKA()) >= Size(ColsKA()) ) {
+      ax = RowsKA();
+      axa = a.RowsKA();
+    }
+    else {
+      ax = ColsKA();
+      axa = a.ColsKA();
+    }
+  }
+  step = Step(ax);
+  stepa = a.Step(axa);
+  gpas = Size(ax)*step;
+  naxa = Size()/Size(ax);
+  return;
+}
 
 // ----------------------------------------------------
@@ -505 +543 @@
   }
   veceli_ = (default_vector_type ==  ColumnVector ) ?  marowi_ : macoli_;
-  ck_memo_vt_ = false;   // Default : Don't Check MemMapping and VectorType for CompareSize  
   // Update OK 
   ndim_ = ndim;
@@ -562 +599 @@
   }
   veceli_ = (default_vector_type ==  ColumnVector ) ?  marowi_ : macoli_;
-  ck_memo_vt_ = false;   // Default : Don't Check MemMapping and VectorType for CompareSize  
   // Update OK 
   ndim_ = ndim;
@@ -609 +645 @@
   marowi_ = a.marowi_;
   veceli_ = a.veceli_;
-  ck_memo_vt_ = a.ck_memo_vt_;
   // Update OK 
   ndim_ = a.ndim_;