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

Timestamp:

Feb 23, 2006, 2:50:26 PM (20 years ago)

Author:

ansari

Message:

Documentation + debug Range et extraction sous-tableaux , Reza 23/02/2006

File:

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

trunk/SophyaLib/TArray/basarr.cc

@@ -360 +360 @@
 }
 
-//! Change dimension if some size == 1
+//! Compact arrays - supresses size=1 axes.
 void BaseArray::CompactAllDim()
 {
@@ -383 +383 @@
 }
 
-//! Change dimension if some trailed size == 1
+//! Compact array taling dimensions, for size=1 traling axes.
 void BaseArray::CompactTrailingDim()
 {
@@ -391 +391 @@
   sa_size_t step[BASEARRAY_MAXNDIMS];
   for(int_4 k=0; k<ndim_; k++) {
-    size[ndim] = size_[k];
-    step[ndim] = step_[k];
-    if (size_[k] > 1)  ndim=k;
+    size[k] = size_[k];
+    step[k] = step_[k];
+    if (size_[k] > 1)  ndim=k+1;
   }
   if (ndim == 0)  ndim = 1;
@@ -714 +714 @@
 
 
-//! Update sizes and information relative to array \b a
-/*!
-  \param a : array to be compare with
-  \param ndim : could be change (but should be less than the ndim of the current class)
-  \param siz[ndim],pos[ndim],step[ndim] : could be changed but must be
-             compatible within the memory size with those of the current class.
-  \return true if all OK, false if problems appear
-  \return string \b exmsg for explanation in case of problems
+//! Update sizes information for sub-array \b ra
+/*!
+  \param ra : sub-array for which size information has to be computed 
+  \param ndim : number of dimensions for \b ra
+  \param siz[ndim],pos[ndim],step[ndim] : number of elements, offset and step along each dimension,
+   relative to the original array.
+  \warning throw SzMismatchError in case of incompatible dimensions.
  */
 void BaseArray::UpdateSubArraySizes(BaseArray & ra, int_4 ndim, sa_size_t * siz, sa_size_t * pos, sa_size_t * step) const
@@ -729 +728 @@
   int_4 k;
   for(k=0; k<ndim; k++) 
-    if ( (siz[k]*step[k]+pos[k]) > size_[k] )  
+    if ( ((siz[k]-1)*step[k]+pos[k]) >= size_[k] )  
       throw(SzMismatchError("BaseArray::UpdateSubArraySizes( ... ) Size/Pos Error") );
   sa_size_t offset = offset_;