Changeset 2917 in Sophya for trunk/SophyaLib/TArray/utilarr.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/utilarr.cc (modified) (6 diffs)

trunk/SophyaLib/TArray/utilarr.cc

@@ -313 +313 @@
   \class SOPHYA::Range
   \ingroup TArray
-  Class to define a range of indices, to be used with TArra<T> TMatrix<T> TVector<T> ...
-*/
-
-/*!
-  Constructor defining defining the range of indices, starting from \b start to the last.
-  \param start : start index (inclusive)
+  This class can be used to define a range of indices. Range objects are used to extract 
+  sub-arrays and slices, from arrays and matrices. 
+  \sa SOPHYA::TArray SOPHYA::TMatrix
+*/
+
+/*!
+  Constructor defining a range corresponding to the single index \b start
+  \param start : start=end index 
 */
 Range::Range(sa_size_t start)
 {
   start_ = start;
-  end_ = Range::lastIndex();
-  size_ = 0;
+  end_ = start;
+  size_ = 1;
   step_ = 1;
 }
@@ -375 +377 @@
   if (size > 0) {  // Nb d'elements fixe
     size_ = size;
-    if (end == Range::lastIndex())  start_ = end_ = end;
-    else end_ = start_+size_*step_;    
+    if ( (start == end) && (end == Range::lastIndex()) ) start_ = end_ = end;
+    else end_ = start_+(size_-1)*step_;    
   }
   else {
@@ -406 +408 @@
 void Range::Update(sa_size_t osz)
 {
-  if (end_ >= 0)  return;
+  if (end_ >= 0)  return; 
   if (osz == 0) {
     start_ = end_ = 0;
@@ -415 +417 @@
     end_ = osz-1; 
     if ((size_ > 0) && (size_ <= osz/step_)) 
-      start_ = end_ - size_*step_;
+      start_ = end_ - (size_-1)*step_;
     else {
       start_ = end_; 
@@ -425 +427 @@
     size_ = (end_-start_)/step_+1;
   }
+  //DBG  cout << ">>> DBG/Update start=" << start_ << " end=" << end_ 
+  //DBG     << " size=" << size_ << " step=" << step_ << endl;
   return;
 }
@@ -443 +447 @@
   \class SOPHYA::IdentityMatrix
   \ingroup TArray
-  Class to define an identity matrix
-*/
-
-//! Constructor of a (n,n) diagonal matrix with value diag on the diagonal
+  Class to define an identity matrix. This class is mainly intented for 
+  initializing TMatrix<T> objects, proportional to the identity matrix. 
+*/
+
+//! Constructor representing a square matrix (\b n x \b n) with value \b diag on the diagonal
 IdentityMatrix::IdentityMatrix(double diag, sa_size_t n)
 {