Changeset 4035 in Sophya for trunk/SophyaLib/TArray/tvector.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/tvector.cc (modified) (4 diffs)

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