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

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.h (modified) (5 diffs)

trunk/SophyaLib/TArray/utilarr.h

@@ -7 +7 @@
 
 #include "machdefs.h"
+#include "mutyv.h"
+
 #include <stdlib.h>
+#include <vector>
 
 namespace SOPHYA {   
@@ -26 +29 @@
 //////////////////////////////////////////////////////////
 //! Class to generate a random sequence of values
-class RandomSequence {
+class Sequence {
+public:
+  virtual ~Sequence();
+  virtual MuTyV & Value(uint_8 k) const = 0;
+  inline MuTyV & operator () (uint_8 k) const { return(Value(k)) ; }
+};
+
+class RandomSequence : public Sequence {
 public:
   //! to define the generator type
@@ -34 +44 @@
     };
 
-  RandomSequence(int typ = RandomSequence::Gaussian, double m=0., double s=1.);
-  double Rand();
+  explicit RandomSequence(int typ = RandomSequence::Gaussian, double m=0., double s=1.);
+  virtual  ~RandomSequence();
+  virtual MuTyV & Value(uint_8 k) const ;
+  double   Rand();
+
 protected:
   int typ_;            //!< random generation type
   double mean_, sig_;  //!< generation parameters mean and sigma (if needed)
+  mutable MuTyV retv_;
 };
 
@@ -44 +58 @@
 //////////////////////////////////////////////////////////
 //! Class to generate a sequence of values
-class Sequence {
+class RegularSequence : public Sequence {
 public:
-  explicit Sequence (double start=0., double step=1., Arr_DoubleFunctionOfX f=NULL);
-  explicit Sequence (RandomSequence rseq);
+  explicit RegularSequence (double start=0., double step=1., Arr_DoubleFunctionOfX f=NULL);
+  virtual  ~RegularSequence();
 
   //! return start value of the sequence
@@ -53 +67 @@
   //! return step value of the sequence
   inline double & Step() { return step_; }
-  double operator () (uint_4 k);
+
+  virtual MuTyV & Value(uint_8 k) const ;
+
 protected:
   double start_;              //!< start value of the sequence
   double step_;               //!< step value of the sequence
   Arr_DoubleFunctionOfX myf_; //!< pointer to the sequence function
-  bool fgrseq_;               //!< true if RandomSequence is used
-  RandomSequence rseq_;       //!< RandomSequence
+  mutable MuTyV retv_;
 };
+
+class EnumeratedSequence : public Sequence  {
+public:
+  virtual ~EnumeratedSequence();
+  virtual MuTyV & Value(uint_8 k) const ;
+  EnumeratedSequence & operator , (MuTyV const & v);
+private:
+  vector<MuTyV> vecv_;
+  mutable MuTyV retv_;
+};
+
+inline EnumeratedSequence operator , (MuTyV const & a, MuTyV const & b)
+{ EnumeratedSequence seq;   return ((seq,a),b) ; }
 
 //////////////////////////////////////////////////////////