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

Timestamp:

Apr 3, 2000, 7:36:01 PM (25 years ago)

Author:

ansari

Message:

Amelioation / debugging de la classe TArray<T> - TVector et TMatrix

heritent maintenant de TArray<T> - Classe RCMatrix rendu prive au fichier
sopemtx.cc - linfit.cc integre a sopemtx.cc

Reza 03/04/2000

File:

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

trunk/SophyaLib/TArray/basarr.cc

@@ -14 +14 @@
                                  "Stride(int )", "ElemCheckBound()", "operator()" };
 uint_4 BaseArray::max_nprt_ = 50;
+short  BaseArray::default_memory_mapping = CMemoryMapping;
 
 // Methodes statiques globales
@@ -22 +23 @@
 
 
-uint_8 BaseArray::ComputeTotalSize(uint_4 ndim, uint_4 * siz, uint_4 step, uint_8 offset)
+uint_8 BaseArray::ComputeTotalSize(uint_4 ndim, const uint_4 * siz, uint_4 step, uint_8 offset)
 {
   uint_8 rs = step;
@@ -28 +29 @@
   return(rs+offset);
 }
+
+short BaseArray::SetDefaultMemoryMapping(short mm)
+{
+  default_memory_mapping = ( (mm == CMemoryMapping) ? CMemoryMapping : FortranMemoryMapping) ; 
+  return default_memory_mapping;
+}
+
+
+short BaseArray::SelectMemoryMapping(short mm)
+// si mm == CMemoryMapping, elements d'une ligne suivant X (consecutif)
+// sinon (mm == FortranMemoryMapping)  elements d'une colonne suivant X 
+{
+  if ( (mm == CMemoryMapping) || (mm == FortranMemoryMapping) )  return (mm) ; 
+  else return (default_memory_mapping);
+}
+
+void BaseArray::UpdateMemoryMapping(short mm, uint_4 & nx, uint_4 & ny)
+{
+  if ( (mm != CMemoryMapping) && (mm != FortranMemoryMapping) ) mm = default_memory_mapping;
+  if (mm == CMemoryMapping) {
+    marowi_ = veceli_ = 1;  macoli_ = 0;
+    uint_4 nr = nx;
+    nx = ny;   ny = nr;
+  }
+  else {
+    marowi_ = veceli_ = 0;  macoli_ = 1;
+  }  
+}
+
+void BaseArray::UpdateMemoryMapping(BaseArray const & a, short mm)
+{
+  if (mm == SameMemoryMapping) 
+    mm = ((a.marowi_ == 1) ? CMemoryMapping : FortranMemoryMapping);
+  if ( (mm != CMemoryMapping) && (mm != FortranMemoryMapping) ) mm = default_memory_mapping;
+  if (mm == CMemoryMapping) {
+    marowi_ = veceli_ = 1;  macoli_ = 0;
+  }
+  else {
+    marowi_ = veceli_ = 0;  macoli_ = 1;
+  }  
+}
+
 
 // -------------------------------------------------------
@@ -44 +87 @@
   moystep_ = 0;
   offset_ = 0;
-  // Default for matrices : Lines = Y , Columns = X
+  // Default for matrices : Lines = Y , Columns = X, Default Vectore= ColumnVector
   macoli_ = 0;
-  marowi_ = 1;
+  veceli_ = marowi_ = 1;
 }
 
@@ -60 +103 @@
   for(int k=0; k<ndim_; k++) 
     if (size_[k] != a.size_[k])  return(false);
-  if ( (macoli_ != a.macoli_) || (marowi_ != a.marowi_) )  return(false);
+  if ( (macoli_ != a.macoli_) || (marowi_ != a.marowi_) ||
+       (veceli_ != a.veceli_) )  return(false);
   return(true);
 }
@@ -196 +240 @@
   // Default for matrices : Lines = Y , Columns = X
   macoli_ = 0;
-  marowi_ = 1;
+  marowi_ = veceli_ = 1;
   // Update OK 
   ndim_ = ndim;
@@ -238 +282 @@
   // Default for matrices : Lines = Y , Columns = X
   macoli_ = 0;
-  marowi_ = 1;
+  marowi_ = veceli_ = 1;
   // Update OK 
   ndim_ = ndim;
@@ -278 +322 @@
   macoli_ = a.macoli_;
   marowi_ = a.marowi_;
+  veceli_ = a.veceli_;
   // Update OK 
   ndim_ = a.ndim_;
@@ -284 +329 @@
 
 
-void BaseArray::SubArray(BaseArray & ra, uint_4 ndim, uint_4 * siz, uint_4 * pos, uint_4 * step)
-{
-  if ( (ndim > ndim_) || (ndim < 1) ) throw(SzMismatchError("BaseArray::SubArray( ... ) NDim Error") );
+void BaseArray::UpdateSubArraySizes(BaseArray & ra, uint_4 ndim, uint_4 * siz, uint_4 * pos, uint_4 * step) const
+{
+  if ( (ndim > ndim_) || (ndim < 1) ) 
+    throw(SzMismatchError("BaseArray::UpdateSubArraySizes( ... ) NDim Error") );
   int k;
   for(k=0; k<ndim; k++) 
     if ( (siz[k]*step[k]+pos[k]) > size_[k] )  
-      throw(SzMismatchError("BaseArray::SubArray( ... ) Size/Pos Error") );
+      throw(SzMismatchError("BaseArray::UpdateSubArraySizes( ... ) Size/Pos Error") );
   uint_8 offset = offset_;
   for(k=0; k<ndim_; k++) { 
@@ -296 +342 @@
     step[k] *= step_[k];
   }
-  string exm = "BaseArray::SubArray() ";
+  string exm = "BaseArray::UpdateSubArraySizes() ";
   if (!ra.UpdateSizes(ndim, siz, step, offset,  exm))
      throw( ParmError(exm) );
-  //  (ra.mNDBlock).Share(mNDBlock);
   return;
 }