Changeset 1412 in Sophya for trunk/SophyaLib

Timestamp:

Feb 20, 2001, 7:29:18 PM (25 years ago)

Author:

ansari

Message:

Modifs sur TMatrix::Transpose() et ajout methode SetSize comme alias de ReSize ds TMatrix et TVector - Reza 20/2/2001

Location:

trunk/SophyaLib/TArray

Files:

• tmatrix.cc (modified) (4 diffs)
• tmatrix.h (modified) (2 diffs)
• tvector.h (modified) (1 diff)
• utilarr.cc (modified) (1 diff)

trunk/SophyaLib/TArray/tmatrix.cc

@@ -1 @@
-// $Id: tmatrix.cc,v 1.16 2000-08-29 16:10:30 ansari Exp $
+// $Id: tmatrix.cc,v 1.17 2001-02-20 18:29:17 ansari Exp $
 //                         C.Magneville          04/99
 #include "machdefs.h"
@@ -244 +244 @@
 ////////////////////////////////////////////////////////////////
 // Transposition
-//! Transpose matrix in place
-template <class T>
-TMatrix<T>& TMatrix<T>::Transpose() 
+//! Transpose matrix in place, by changing the memory mapping
+template <class T>
+TMatrix<T>& TMatrix<T>::TransposeSelf() 
 {
   short vt = (marowi_ == veceli_) ? ColumnVector : RowVector;
@@ -257 +257 @@
 
 
-//! Transpose matrix into new matrix
+//! Returns the transpose of the original matrix. 
+/*!
+  The data is shared between the two matrices
+  \return return a new matrix
+ */
+template <class T>
+TMatrix<T> TMatrix<T>::Transpose()
+{
+  TMatrix<T> tm(*this);
+  tm.TransposeSelf();
+  return tm;
+}
+
+//! Returns a new matrix, corresponding to the transpose of the original matrix
 /*!
   \param mm : define the memory mapping type
@@ -275 +288 @@
 }
 
-//! Rearrange data in memory memoire according to \b mm
+//! Rearrange data in memory according to \b mm
 /*!
   \param mm : define the memory mapping type

trunk/SophyaLib/TArray/tmatrix.h

@@ -48 +48 @@
   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 ReSize(sa_size_t r,sa_size_t c, short mm=BaseArray::SameMemoryMapping);
+  //! a synonym (alias) for method ReSize(sa_size_t, sa_size_t, short)
+  inline void SetSize(sa_size_t r,sa_size_t c, short mm=BaseArray::SameMemoryMapping)
+                 { ReSize(r, c, mm); }
+  // Reallocation de place
   void Realloc(sa_size_t r,sa_size_t c, short mm=BaseArray::SameMemoryMapping, bool force=false);
 
@@ -69 +73 @@
 
   // Operations matricielles
-  TMatrix<T>& Transpose();
+  TMatrix<T>& TransposeSelf();
+  TMatrix<T>  Transpose();
   //mm = SameMemoryMapping or CMemoryMapping or FortranMemoryMapping 
   TMatrix<T>  Transpose(short mm); 

trunk/SophyaLib/TArray/tvector.h

@@ -40 +40 @@
   // Gestion taille/Remplissage
   void ReSize(sa_size_t n, short lcv=SameVectorType ); 
+  //! a synonym (alias) for method ReSize(sa_size_t, short)
+  inline void SetSize(sa_size_t n, short lcv=SameVectorType )
+              { ReSize(n, lcv); }
   void Realloc(sa_size_t n, short lcv=SameVectorType, bool force=false);
 

trunk/SophyaLib/TArray/utilarr.cc

@@ -154 +154 @@
 /*!
   Define a range of indexes
-  \param start : start index
-  \param end : start end
-  \param size : size
-  \param step : step
+  \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