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

Timestamp:

Aug 29, 2000, 6:10:32 PM (25 years ago)

Author:

ansari

Message:

Introduction du type sa_size_t (taille des tableaux), operateur - (TArray::operator - et NegateElt()) - Reza 29/8/2000

File:

• trunk/SophyaLib/TArray/utilarr.h (modified) (7 diffs)

trunk/SophyaLib/TArray/utilarr.h

@@ -32 +32 @@
 public:
   virtual ~Sequence();
-  virtual MuTyV & Value(uint_8 k) const = 0;
-  inline MuTyV & operator () (uint_8 k) const { return(Value(k)) ; }
+  virtual MuTyV & Value(sa_size_t k) const = 0;
+  inline MuTyV & operator () (sa_size_t k) const { return(Value(k)) ; }
 };
 
@@ -46 +46 @@
   explicit RandomSequence(int typ = RandomSequence::Gaussian, double m=0., double s=1.);
   virtual  ~RandomSequence();
-  virtual MuTyV & Value(uint_8 k) const ;
+  virtual MuTyV & Value(sa_size_t k) const ;
   double   Rand();
 
@@ -68 +68 @@
   inline double & Step() { return step_; }
 
-  virtual MuTyV & Value(uint_8 k) const ;
+  virtual MuTyV & Value(sa_size_t k) const ;
 
 protected:
@@ -80 +80 @@
 public:
   virtual ~EnumeratedSequence();
-  virtual MuTyV & Value(uint_8 k) const ;
+  virtual MuTyV & Value(sa_size_t k) const ;
   EnumeratedSequence & operator , (MuTyV const & v);
+  EnumeratedSequence & operator = (MuTyV const & v);
 private:
   vector<MuTyV> vecv_;
@@ -87 +88 @@
 };
 
-inline EnumeratedSequence operator , (MuTyV const & a, MuTyV const & b)
-{ EnumeratedSequence seq;   return ((seq,a),b) ; }
+  //inline EnumeratedSequence operator , (MuTyV const & a, MuTyV const & b)
+  //{ EnumeratedSequence seq;   return ((seq,a),b) ; }
 
 //////////////////////////////////////////////////////////
@@ -94 +95 @@
 class Range {
 public:
-  explicit Range(uint_4 start=0, uint_4 end=0, uint_4 size=1, uint_4 step=1);
+  explicit Range(sa_size_t start=0, sa_size_t end=0, sa_size_t size=1, sa_size_t step=1);
   //! Return the start index
-  inline uint_4 & Start()  {  return start_; }
+  inline sa_size_t & Start()  {  return start_; }
   //! Return the last index
-  inline uint_4 & End()    {  return end_; }
+  inline sa_size_t & End()    {  return end_; }
   //! Return the size
-  inline uint_4 & Size()   {  return size_; }
+  inline sa_size_t & Size()   {  return size_; }
   //! Return the step
-  inline uint_4 & Step()   {  return step_; }
+  inline sa_size_t & Step()   {  return step_; }
 protected:
-  uint_4 start_; //!< start index
-  uint_4 end_;   //!< end index
-  uint_4 size_;  //!< size
-  uint_4 step_;  //!< step
+  sa_size_t start_; //!< start index
+  sa_size_t end_;   //!< end index
+  sa_size_t size_;  //!< size
+  sa_size_t step_;  //!< step
 };
 
@@ -114 +115 @@
 class IdentityMatrix {
 public:
-  explicit IdentityMatrix(double diag=1., uint_4 n=0);
+  explicit IdentityMatrix(double diag=1., sa_size_t n=0);
   //! return the size of the identity matrix
-  inline uint_4 Size() { return size_; }
+  inline sa_size_t Size() { return size_; }
   //! return the value of the diagonal elements
   inline double Diag() { return diag_; }
 protected:
-  uint_4 size_; //!< size of the matrix
+  sa_size_t size_; //!< size of the matrix
   double diag_; //!< value of the diagonal elements
 };