Changeset 1636 in Sophya

Timestamp:

Aug 13, 2001, 2:38:17 PM (24 years ago)

Author:

ansari

Message:

Correction bugs ds UpdateSize (calcul AvgStep() et configuration Vecteur/Matrices + protection constructeur TArray() depuis NDataBlock - Reza 13/8/2001

Location:

trunk/SophyaLib/TArray

Files:

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

trunk/SophyaLib/TArray/basarr.cc

@@ -206 +206 @@
 void BaseArray::SetMemoryMapping(short mm)
 {
-  if (mm == SameMemoryMapping) return;
-  if (mm == AutoMemoryMapping)  mm = default_memory_mapping;
-  if ( (mm != CMemoryMapping) && (mm != FortranMemoryMapping) ) return;
-  short vt = (marowi_ == veceli_) ? ColumnVector : RowVector;
+  if (mm == SameMemoryMapping) mm = GetMemoryMapping();
+  else if (mm == AutoMemoryMapping)  mm = default_memory_mapping;
+  if ( (mm != CMemoryMapping) && (mm != FortranMemoryMapping) ) mm = CMemoryMapping;
+  short vt = GetVectorType(); 
   if (mm == CMemoryMapping) {
     marowi_ =  1;  macoli_ = 0;
@@ -216 +216 @@
     marowi_ =  0;  macoli_ = 1;
   }
-  if ( (ndim_ == 2) && ((size_[0] == 1) || (size_[1] == 1)) ) {
+  if ( (ndim_ == 2) && ((size_[0] == 1) || (size_[1] == 1)) 
+       && (size_[0] != size_[1]) ) {
     // Choix automatique Vecteur ligne ou colonne
     if ( size_[macoli_] == 1)  veceli_ = marowi_;
     else veceli_ = macoli_;
   }
-  else   veceli_ = (vt ==  ColumnVector ) ?  marowi_ : macoli_;
+  else  veceli_ = (vt ==  ColumnVector ) ?  marowi_ : macoli_;
 }
 
@@ -562 +563 @@
   }
   offset_ = offset;
-  // Default for matrices : Memory organisation and Vector type 
-  if (default_memory_mapping == CMemoryMapping) {
-    marowi_ =  1;  macoli_ = 0;
-  }
-  else {
-    marowi_ =  0;  macoli_ = 1;
-  }
-  veceli_ = (default_vector_type ==  ColumnVector ) ?  marowi_ : macoli_;
   // Update OK 
   ndim_ = ndim;
+  // Default for matrices : Memory organisation and Vector type 
+  SetMemoryMapping(BaseArray::SameMemoryMapping);
   return true;
 }
@@ -614 +609 @@
   sa_size_t plast = 0;
   for(k=0; k<ndim; k++)   plast += (siz[k]-1)*step[k];
-  if (plast == minstep*totsize_ )  moystep_ = minstep;
+  if (plast == minstep*(totsize_-1) )  moystep_ = minstep;
   else moystep_ = 0;
   minstep_ = minstep;
   offset_ = offset;
-  // Default for matrices : Memory organisation and Vector type 
-  if (default_memory_mapping == CMemoryMapping) {
-    marowi_ =  1;  macoli_ = 0;
-  }
-  else {
-    marowi_ =  0;  macoli_ = 1;
-  }
-  veceli_ = (default_vector_type ==  ColumnVector ) ?  marowi_ : macoli_;
   // Update OK 
   ndim_ = ndim;
+  // Default for matrices : Memory organisation and Vector type 
+  SetMemoryMapping(BaseArray::SameMemoryMapping);
   return true;
 }

trunk/SophyaLib/TArray/tarray.cc

@@ -87 +87 @@
   string exmsg = "TArray<T>::TArray(int_4, sa_size_t *,  NDataBlock<T> & ... )";
   if (!UpdateSizes(ndim, siz, step, offset, exmsg))  throw( ParmError(exmsg) );
-  
+  if (mNDBlock.Size() < ComputeTotalSize(ndim, siz, step, offset)) {
+    exmsg += " DataBlock.Size() < ComputeTotalSize(...) " ;
+    throw( ParmError(exmsg) );
+  }
 }