Changeset 4035 in Sophya for trunk/SophyaLib/TArray/tarray.cc

Timestamp:

Nov 14, 2011, 5:28:25 PM (14 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

File:

• trunk/SophyaLib/TArray/tarray.cc (modified) (4 diffs)

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);
 }