Changeset 2915 in Sophya for trunk/SophyaLib/TArray/utilarr.cc

Timestamp:

Feb 22, 2006, 7:17:30 PM (20 years ago)

Author:

ansari

Message:

Amelioration de la classe Range - permettant une valeur symbolique pour specifier le dernier index (last()) - Reza 22/02/2006

File:

• trunk/SophyaLib/TArray/utilarr.cc (modified) (2 diffs)

trunk/SophyaLib/TArray/utilarr.cc

@@ -313 +313 @@
   \class SOPHYA::Range
   \ingroup TArray
-  Class to define a range of indexes
-*/
-
-//! Constructor
-/*!
-  Define a range of indexes
+  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)
+*/
+Range::Range(sa_size_t start)
+{
+  start_ = start;
+  end_ = Range::lastIndex();
+  size_ = 0;
+  step_ = 1;
+}
+
+/*!
+  Constructor defining defining the range of indices, from \b start to \b end
   \param start : start index (inclusive)
   \param end : end index (inclusive)
-  \param size : size (number of elements, used if end \<= start)
-  \param step : step (or stride)
-
-  \warning If \b end \> \b start, \b size is computed automatically
-  \warning If not \b size is fixed and \b end recomputed
+*/
+Range::Range(sa_size_t start, sa_size_t end)
+{
+  start_ = start;
+  end_ = end;
+  if (end >= start)   size_ = end-start+1;
+  else size_ = 0;
+  step_ = 1;
+}
+
+/*!
+  Constructor defining defining the range of indices, from \b start to \b end
+  \param start : start index (inclusive)
+  \param end : end index (inclusive)
+  \param step : step (or stride) = index increment
+*/
+Range::Range(sa_size_t start, sa_size_t end, sa_size_t step)
+{
+  start_ = start;
+  end_ = end;
+  step_ = (step > 0) ? step : 1;
+  if (step < 1) step = 1;
+  if (end >= start) 
+    size_ = (end-start)/step_+1;
+  else size_ = 0;
+}
+
+/*!
+  Define a range of indices
+  \param start : start index (inclusive)
+  \param end : end index (inclusive, used if size \<= 0 and end \>= start)
+  \param size : size (number of elements, used if \>= 1 )
+  \param step : step (or stride) = index increment
+
+  \warning If \b size \>= 1 , \b end index computed automatically. 
+  If \b size \< 1 and \b end < \b start , equivalent to \b end = Range()::lastIndex() 
  */
 Range::Range(sa_size_t start, sa_size_t end, sa_size_t size, sa_size_t step)
@@ -331 +373 @@
   start_ = start;
   step_ = (step > 0) ? step : 1;
-  if (end > start) {  // Taille calcule automatiquement 
-    end_ = end;
-    if (step_ > ((end_-start_)+1))  size_ = 1;
-    else size_ = ((end-start)+1)/step_;
-  }
-  else {     // Taille fixee
+  if (size > 0) {  // Nb d'elements fixe
     size_ = size;
-    end_ = start_+size_*step_;
-  }
+    if (end == Range::lastIndex())  start_ = end_ = end;
+    else end_ = start_+size_*step_;    
+  }
+  else {
+    if (end >= start) {  // Indice de fin fixe 
+      end_ = end;
+      size_ = (end-start)/step_+1;
+    }
+    else {  // rien fixe
+      size_ = 0;
+      end_ = Range::lastIndex();
+    }
+  }
+}
+
+/*
+Range::Range(Range const& a)
+{
+  start_ = a.start_;
+  end_ = a.end_;
+  size_ = a.size_;
+  step_ = a.step_;
+}
+*/
+
+/*!
+  This method is called to recompute index ranges, specifying the original array size
+  by the TArray<T> (or derived classes) sub array extraction methods
+*/ 
+void Range::Update(sa_size_t osz)
+{
+  if (end_ >= 0)  return;
+  if (osz == 0) {
+    start_ = end_ = 0;
+    size_ = step_ = 1;
+    return;
+  }
+  if (end_ == start_) {
+    end_ = osz-1; 
+    if ((size_ > 0) && (size_ <= osz/step_)) 
+      start_ = end_ - size_*step_;
+    else {
+      start_ = end_; 
+      size_ = 1;
+    }
+  }
+  else {
+    end_ = osz-1; 
+    size_ = (end_-start_)/step_+1;
+  }
+  return;
 }