Changeset 1156 in Sophya for trunk/SophyaLib/TArray/tmatrix.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/tmatrix.h (modified) (6 diffs)

trunk/SophyaLib/TArray/tmatrix.h

@@ -15 +15 @@
   // Creation / destruction 
   TMatrix();
-  TMatrix(uint_4 r,uint_4 c, short mm=BaseArray::AutoMemoryMapping);
+  TMatrix(sa_size_t r,sa_size_t c, short mm=BaseArray::AutoMemoryMapping);
   TMatrix(const TMatrix<T>& a);
   TMatrix(const TMatrix<T>& a, bool share);
@@ -42 +42 @@
   // Size - Changing the Size 
   //! return number of rows
-  inline uint_4 NRows() const {return Size(marowi_); }
+  inline sa_size_t NRows() const {return Size(marowi_); }
   //! return number of columns
-  inline uint_4 NCols() const {return Size(macoli_); }
+  inline sa_size_t NCols() const {return Size(macoli_); }
   //! return number of columns
-  inline uint_4 NCol()  const {return Size(macoli_); } // back-compat Peida
-
-  void ReSize(uint_4 r,uint_4 c, short mm=BaseArray::SameMemoryMapping);  // Reallocation de place
-  void Realloc(uint_4 r,uint_4 c, short mm=BaseArray::SameMemoryMapping, bool force=false);
+  inline sa_size_t NCol()  const {return Size(macoli_); } // back-compat Peida
+
+  void ReSize(sa_size_t r,sa_size_t c, short mm=BaseArray::SameMemoryMapping);  // Reallocation de place
+  void Realloc(sa_size_t r,sa_size_t c, short mm=BaseArray::SameMemoryMapping, bool force=false);
 
   // Sub-matrix extraction $CHECK$ Reza 03/2000  Doit-on declarer ces methode const ?
@@ -58 +58 @@
   // Lignes et colonnes de la matrice
   //! Return submatrix define by line \b ir (line vector)
-  inline TMatrix<T> Row(uint_4 ir) const
+  inline TMatrix<T> Row(sa_size_t ir) const
                     { return SubMatrix(Range(ir,ir), Range(0,NCols()-1)); }
   //! Return submatrix define by column \b ic (column vector)
-  inline TMatrix<T> Column(uint_4 ic) const
+  inline TMatrix<T> Column(sa_size_t ic) const
                     { return SubMatrix(Range(0,NRows()-1), Range(ic,ic)); }
 
   // Inline element acces methods 
-  inline T const& operator()(uint_4 r,uint_4 c) const;
-  inline T&       operator()(uint_4 r,uint_4 c);
+  inline T const& operator()(sa_size_t r,sa_size_t c) const;
+  inline T&       operator()(sa_size_t r,sa_size_t c);
 
   // Operations matricielles
@@ -116 +116 @@
  //! () : return element for line \b r and column \b c
 template <class T>
-inline T const& TMatrix<T>::operator()(uint_4 r, uint_4 c) const
+inline T const& TMatrix<T>::operator()(sa_size_t r, sa_size_t c) const
 {
 #ifdef SO_BOUNDCHECKING
@@ -128 +128 @@
 //! () : return element for line \b r and column \b c
 template <class T>
-inline T & TMatrix<T>::operator()(uint_4 r, uint_4 c) 
+inline T & TMatrix<T>::operator()(sa_size_t r, sa_size_t c) 
 {
 #ifdef SO_BOUNDCHECKING
@@ -188 +188 @@
     result.Div(b, true); return result;}
 
+////////////////////////////////////////////////////////////////
+// Surcharge d'operateurs B = -A
+
+/*! \ingroup TMatrix \fn operator - (const TMatrix<T>&)
+  \brief Operator - Returns a matrix with elements equal to the opposite of
+  the original matrix elements.  */
+template <class T> inline TMatrix<T> operator - (const TMatrix<T>& a)
+    {TMatrix<T> result; result.CloneOrShare(a); result.SetTemp(true); 
+    result.NegateElt(); return result;}
+
 
 // Surcharge d'operateurs C = A (+,-) B