Changeset 4035 in Sophya

Timestamp:

Nov 14, 2011, 5:28:25 PM (13 years ago)

Author:

ansari

Message:

1/ modif mineure ds TArray<T>::::ReadASCII() au print level global de BaseArray
2/ Correction bug gestion memoire au niveau des constructeurs de copie TArray/TMatrix/TVector
avec un BaseArray en argument. Ajout argument optionnel bool pack a ces constructeurs
3/ On autorise desormais la creation des objets TArray/TMatrix/TVector par constructeur de
copie sur des objets non alloues

Reza, 14/11/2011

Location:

trunk/SophyaLib/TArray

Files:

• basarr.cc (modified) (4 diffs)
• basarr.h (modified) (1 diff)
• tarray.cc (modified) (4 diffs)
• tarray.h (modified) (1 diff)
• tmatrix.cc (modified) (3 diffs)
• tmatrix.h (modified) (1 diff)
• tvector.cc (modified) (4 diffs)
• tvector.h (modified) (1 diff)

trunk/SophyaLib/TArray/basarr.cc

@@ -118 +118 @@
      mm == FortranMemoryMapping : Fortran like memory mapping
   \endverbatim
+  \return default memory mapping value
   \verbatim
   # ===== For Matrices
@@ -138 +139 @@
      ex: Mc[2][0] = Mmath(3,1) = 31
          Mc[0][2] = Mmath(1,3) = 13
-  *** RESUME diff Idl/Fortan/C/Math:
+  *** SUMMARY difference Idl/Fortan/C/Math:
     Midl(col-1,row-1) = Mfor(col,row) = Mc[row-1][col-1] = Mmath(row,col)
     TRANSPOSE(column-major array) --> row-major array
   \endverbatim
-  \return default memory mapping value
  */
 short BaseArray::SetDefaultMemoryMapping(short mm)
@@ -565 +565 @@
 }
 
-//! Return attached DVList
+//! Return the attached DVList info object 
 DVList& BaseArray::Info()
 {
@@ -571 +571 @@
 return(*mInfo);
 }
+
+
 
 //! Update sizes and information for array

trunk/SophyaLib/TArray/basarr.h

@@ -160 +160 @@
   virtual void   WriteASCII(ostream& os) const = 0;
 
-  // DVList info Object
+  // Access to the DVList info Object
   DVList& Info();
+  //! return true if the  DVList info Object has been created (not empty)
+  inline bool HasInfoObject() const { return ((mInfo!=NULL)?true:false); }  
+
+//! Return the attached DVList object pointer (for special uses only TArray ... ) 
+  inline DVList* getInfoPointer() const { return mInfo; }
 
 protected:

trunk/SophyaLib/TArray/tarray.cc

@@ -197 +197 @@
   : BaseArray() , mNDBlock(a.mNDBlock) 
 {
+  if (a.NbDimensions() == 0)  return;    // Reza-Nov 2011: we allow copy contrsuctor on non allocated arrays  
   string exmsg = "TArray<T>::TArray(const TArray<T>&)";
   if (!UpdateSizes(a, exmsg))  throw( ParmError(exmsg) );
@@ -210 +211 @@
   : BaseArray() , mNDBlock(a.mNDBlock, share) 
 {
-  if (a.NbDimensions() == 0)  return;  
+  if (a.NbDimensions() == 0)  return;  // Reza-Nov 2011: we allow copy contrsuctor on non allocated arrays  
   string exmsg = "TArray<T>::TArray(const TArray<T>&, bool)";
   if (!UpdateSizes(a, exmsg))  throw( ParmError(exmsg) );
@@ -216 +217 @@
 }
 
-//! Constructor with size and contents copied (after conversion) from a different type TArray
-template <class T>
-TArray<T>::TArray(const BaseArray& a)
+//! Constructor with size and contents copied (after conversion) from an array with different data type.
+/*!
+  The array size and memory layout are copied from the array \b a, or a packed array is created if \b pack==true.
+  \param a : original array, to copy sizes and data from
+  \param pack : if \b true , create a packed array, else same memory layout as \b a. 
+*/
+template <class T>
+TArray<T>::TArray(const BaseArray& a, bool pack)
   : BaseArray() , mNDBlock() 
 {
   if (a.NbDimensions() == 0)  return;  
-  string exmsg = "TArray<T>::TArray(const BaseArray&)";
-  if (!UpdateSizes(a, exmsg))  throw( ParmError(exmsg) );
-  mNDBlock.ReSize(totsize_);    
-  //  if (a.mInfo) mInfo = new DVList(*(a.mInfo));  - pb protected !
+  string exmsg = "TArray<T>::TArray(const BaseArray&,bool)";
+  ReSize(a,pack,false);
   ConvertAndCopyElt(a);
+  if (a.HasInfoObject()) mInfo = new DVList(*(a.getInfoPointer()));     
 }
 
@@ -1626 +1631 @@
   }
   SetSeq(es);
-  cout << "TArray<T>::ReadASCII()/Info: " << n << " elements read from stream " 
-       << " (Row,Col= " << nr << "," << nc << ")" << endl;
+  if (BaseArray::GetPrintLevel()>0) 
+    cout << "TArray<T>::ReadASCII()/Info: " << n << " elements read from stream " 
+         << " (Row,Col= " << nr << "," << nc << ")" << endl;
   return(n);
 }

trunk/SophyaLib/TArray/tarray.h

@@ -35 +35 @@
   TArray(const TArray<T>& a);
   TArray(const TArray<T>& a, bool share);
-  TArray(const BaseArray& a);
+  TArray(const BaseArray& a, bool pack=true);
 
   virtual ~TArray();

trunk/SophyaLib/TArray/tmatrix.cc

@@ -1 @@
-// $Id: tmatrix.cc,v 1.40 2010-08-05 12:16:19 ansari Exp $
+// $Id: tmatrix.cc,v 1.41 2011-11-14 16:28:25 ansari Exp $
 //                         C.Magneville          04/99
 #include "sopnamsp.h"
@@ -127 +127 @@
 : TArray<T>(a, share)
 {
+  arrtype_ = 1;   // Type = Matrix
+  if (a.NbDimensions() == 0)  {   // Reza-Nov 2011: we allow copy contrsuctor on non allocated arrays  
+    UpdateMemoryMapping(a, SameMemoryMapping);
+    return;
+  }
   if (a.NbDimensions() > 2) 
     throw SzMismatchError("TMatrix<T>::TMatrix(const TArray<T>& a, ...) a.NbDimensions()>2");
@@ -134 +139 @@
     ndim_ = 2;
   }
+  UpdateMemoryMapping(a, SameMemoryMapping);
+}
+
+//! Constructor of a matrix from a TArray \b a , with different data type
+/*!
+  Matrix size and memory layout are copied from the array \b a, or a packed matrix is created if \b pack==true.
+  \param a : original array, to copy sizes and data from
+  \param pack : if \b true , create a packed matrix, else same memory layout as \b a. 
+*/
+template <class T>
+TMatrix<T>::TMatrix(const BaseArray& a, bool pack)
+  : TArray<T>()
+{
+  // On ne peut pas passer par TArray<T>(const BaseArray&), car il faut initialiser  arrtype_ d'abord !
   arrtype_ = 1;   // Type = Matrix
+  if (a.NbDimensions() == 0)  {   // Reza-Nov 2011: we allow copy contrsuctor on non allocated arrays  
+    UpdateMemoryMapping(a, SameMemoryMapping);
+    return;
+  }
+  if (a.NbDimensions() > 2) 
+    throw SzMismatchError("TMatrix<T>::TMatrix((const BaseArray& a, bool) a.NbDimensions()>2");
+  string exmsg = "TMatrix<T>::TMatrix(const BaseArray&,bool)";
+  TArray<T>::ReSize(a,pack,false);
   UpdateMemoryMapping(a, SameMemoryMapping);
-}
-
-//! Constructor of a matrix from a TArray \b a , with a different data type
-template <class T>
-TMatrix<T>::TMatrix(const BaseArray& a)
-: TArray<T>()
-{
-  arrtype_ = 1;   // Type = Matrix
-  UpdateMemoryMapping(a, SameMemoryMapping);
-  SetBA(a);
+  TArray<T>::ConvertAndCopyElt(a);
 }
 

trunk/SophyaLib/TArray/tmatrix.h

@@ -21 +21 @@
   TMatrix(const TMatrix<T>& a);
   TMatrix(const TMatrix<T>& a, bool share);
-  TMatrix(const TArray<T>& a,  bool share=true);
-  TMatrix(const BaseArray& a); 
+  TMatrix(const TArray<T>& a, bool share=true);
+  TMatrix(const BaseArray& a, bool pack=true); 
 
   virtual ~TMatrix();

trunk/SophyaLib/TArray/tvector.cc

@@ -1 @@
-// $Id: tvector.cc,v 1.28 2010-08-12 15:01:47 ansari Exp $
+// $Id: tvector.cc,v 1.29 2011-11-14 16:28:25 ansari Exp $
 //                         C.Magneville          04/99
 #include "sopnamsp.h"
@@ -56 +56 @@
 /*!
   \param n : number of elements
-  \param lcv : line or column vector ?
+  \param lcv : line or column vector (BaseArray::AutoVectorType / SameVectorType / ColumnVector / RowVector)
   \param mm : memory mapping type
   \param fzero : if \b true , set vector elements to zero 
@@ -108 +108 @@
 : TMatrix<T>(a, share)
 {
+  arrtype_ = 2;   // Type = Vector
+  if (a.NbDimensions() == 0)  return;    // Reza-Nov 2011: we allow copy contrsuctor on non allocated arrays  
   if ( (size_[0] != 1) && (size_[1] != 1) )
     throw SzMismatchError("TVector<T>::TVector(const TArray<T>& a) NRows()!=1 && NCols()!=1 ");
-  arrtype_ = 2;   // Type = Vector
   if ( (size_[0] == 1) && (size_[1] == 1) ) {
     if (lcv == SameVectorType) lcv = a.GetVectorType();
@@ -119 +120 @@
 
 //! Constructor of a vector from a TArray \b a , with a different data type
-template <class T>
-TVector<T>::TVector(const BaseArray& a)
-: TMatrix<T>(a)
-{
+/*!
+  vector size and memory layout are copied from the array \b a, or a packed vector is created if \b pack==true.
+  \param a : original array, to copy sizes and data from
+  \param pack : if \b true , create a packed vector, else same memory layout as \b a. 
+*/
+template <class T>
+TVector<T>::TVector(const BaseArray& a, bool pack)
+  : TMatrix<T>(a,pack)
+{
+  arrtype_ = 2;   // Type = Vector
+  if (a.NbDimensions() == 0)  return;    // Reza-Nov 2011: we allow copy contrsuctor on non allocated arrays  
   if ( (size_[0] != 1) && (size_[1] != 1) )
-    throw SzMismatchError("TVector<T>::TVector(const BaseArray& a) NRows()!=1 && NCols()!=1 ");
-  arrtype_ = 2;   // Type = Vector
+    throw SzMismatchError("TVector<T>::TVector(const BaseArray& a,bool) NRows()!=1 && NCols()!=1 ");
 }
 

trunk/SophyaLib/TArray/tvector.h

@@ -20 +20 @@
   TVector(const TVector<T>& v);
   TVector(const TVector<T>& v, bool share);
-  TVector(const TArray<T>& a,  bool share=true, short lcv=BaseArray::AutoVectorType);
-  TVector(const BaseArray& a);
+  TVector(const TArray<T>& a, bool share=true, short lcv=BaseArray::AutoVectorType);
+  TVector(const BaseArray& a, bool pack=true);
   TVector(const vector<T>& v, short lcv=BaseArray::AutoVectorType);