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

Timestamp:

Jul 27, 2000, 2:00:10 AM (25 years ago)

Author:

ansari

Message:

Suite operations entre matrices de <> MemOrg, Amelioration des Sequences - Reza 27/7/2000

File:

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

trunk/SophyaLib/TArray/utilarr.cc

@@ -7 +7 @@
 
 // Classe utilitaires
+
+Sequence::~Sequence()
+{
+}
 
 //////////////////////////////////////////////////////////
@@ -27 +31 @@
   sig_ = s;
 }
+RandomSequence::~RandomSequence()
+{
+}
 
 //! Return random sequence values.
@@ -41 +48 @@
 }
 
+MuTyV & RandomSequence::Value(uint_8 k) const 
+{
+  if (typ_ == Flat) retv_ = drandpm1()*sig_ + mean_;
+  else retv_ = GauRnd(mean_, sig_);
+  return retv_;
+}
+
 
 //////////////////////////////////////////////////////////
 /*!
-  \class SOPHYA::Sequence
+  \class SOPHYA::RegularSequence
   \ingroup TArray
   Class to generate a sequence of values
@@ -55 +69 @@
   \param f : pointer to the sequence function
 
-  See \ref SequenceOperat "operator()"
+  See \ref RegularSequenceOperat "operator()"
  */
-Sequence::Sequence(double start, double step, Arr_DoubleFunctionOfX f)
-  : rseq_(RandomSequence::Gaussian)
+RegularSequence::RegularSequence(double start, double step, Arr_DoubleFunctionOfX f)
 {
   start_ = start;
   step_ = step;
   myf_ = f;
-  fgrseq_ = false;
 }
 
-//! Constructor
-/*!
-  \param rseq : RandomSequence
-
-  See \ref SequenceOperat "operator()"
- */
-Sequence::Sequence(RandomSequence rseq)
+RegularSequence::~RegularSequence()
 {
-  start_ = 0.;
-  step_ = 1.;
-  myf_ = NULL;  
-  rseq_ = rseq;
-  fgrseq_ = true;
 }
 
@@ -84 +85 @@
 /*!
   \param k : index of the value
-  \anchor SequenceOperat
+  \anchor RegularSequenceOperat
 
   If the constructor was done with RandomSequence, return a RandomSequence
@@ -94 +95 @@
   \return the \b k th value
  */
-double Sequence::operator () (uint_4 k)
+
+MuTyV & RegularSequence::Value (uint_8 k) const 
 {
-  if (fgrseq_) return(rseq_.Rand());
-  else {
-    double x = start_+(double)k*step_;
-    if (myf_)  return(myf_(x));
-    else return x;
-  }
+  double x = start_+(double)k*step_;
+  if (myf_)  x = myf_(x);
+  retv_ = x;
+  return(retv_);
+}
+
+EnumeratedSequence::~EnumeratedSequence()
+{
+}
+
+MuTyV & EnumeratedSequence::Value (uint_8 k) const 
+{
+  if (k >= vecv_.size())  retv_ = 0;
+  else retv_ = vecv_[k];
+  return(retv_);
+}
+
+EnumeratedSequence & EnumeratedSequence::operator , (MuTyV const & v)
+{
+  vecv_.push_back(v);
+  return(*this);
 }