Changeset 813 in Sophya for trunk/SophyaLib/TArray/tvector.cc

Timestamp:

Apr 5, 2000, 5:44:19 PM (25 years ago)

Author:

ansari

Message:

Correction bug/amelioarions TArray,TMatrix,TVector - Reza 5/4/2000

File:

• trunk/SophyaLib/TArray/tvector.cc (modified) (6 diffs)

trunk/SophyaLib/TArray/tvector.cc

@@ -1 @@
-// $Id: tvector.cc,v 1.2 2000-04-03 17:35:59 ansari Exp $
+// $Id: tvector.cc,v 1.3 2000-04-05 15:44:17 ansari Exp $
 //                         C.Magneville          04/99
 #include "machdefs.h"
@@ -18 +18 @@
 TVector<T>::TVector(uint_4 n, short lcv, short mm)
 // Constructeur 
-  : TMatrix<T>((lcv == ColumnVector) ? n : 1,(lcv == ColumnVector) ? 1 : 0, mm)
+  : TMatrix<T>(1,1,mm)
 {
-  if (lcv == ColumnVector) veceli_ = marowi_;
-  else veceli_ = macoli_;
+  lcv = SelectVectorType(lcv);
+  ReSize(n,lcv);
 }
 
@@ -43 +43 @@
 : TMatrix<T>(a)
 {
+  if ( (size_[0] != 1) && (size_[1] != 1) )
+    throw SzMismatchError("TVector<T>::TVector(const TArray<T>& a) NRows()!=1 && NCols()!=1 ");
 }
 
 
 template <class T>
-TVector<T>::TVector(const TArray<T>& a, bool share, short lcv, short mm )
+TVector<T>::TVector(const TArray<T>& a, bool share, short mm, short lcv )
 : TMatrix<T>(a, share, mm)
 {
-  if (lcv == SameTypeVector) veceli_ = a.VectKA();
-  else {
-    if (lcv == ColumnVector) veceli_ = marowi_;
-    else veceli_ = macoli_;
+  if ( (size_[0] != 1) && (size_[1] != 1) )
+    throw SzMismatchError("TVector<T>::TVector(const TArray<T>& a) NRows()!=1 && NCols()!=1 ");
+  if ( (size_[0] == 1) && (size_[1] == 1) ) {
+    if (lcv == SameVectorType) lcv = a.GetVectorType();
+    if ( (lcv != ColumnVector) && (lcv != RowVector) ) lcv = GetDefaultVectorType();
+    veceli_ = (lcv ==  ColumnVector ) ?  marowi_ : macoli_;
   }
 }
@@ -70 +74 @@
     throw(SzMismatchError("TVector::ReSize() n = 0 "));
   uint_4 r,c;
-  if (lcv == SameTypeVector)  lcv = GetVectorType();
+  if (lcv == SameVectorType)  lcv = GetVectorType();
+  else if ( (lcv != ColumnVector) && (lcv != RowVector) ) lcv = GetDefaultVectorType();
   if (lcv == ColumnVector) { r = n;  c = 1; }
   else { c = n; r = 1; }
   TMatrix<T>::ReSize(r,c);
+  veceli_ = (lcv ==  ColumnVector ) ?  marowi_ : macoli_;
 }
 
@@ -82 +88 @@
     throw(SzMismatchError("TVector::Realloc() n = 0 "));
   uint_4 r,c;
-  if (lcv == SameTypeVector)  lcv = GetVectorType();
+  if (lcv == SameVectorType)  lcv = GetVectorType();
+  else if ( (lcv != ColumnVector) && (lcv != RowVector) ) lcv = GetDefaultVectorType();
   if (lcv == ColumnVector) { r = n;  c = 1; }
   else { c = n; r = 1; }
   TMatrix<T>::Realloc(r,c,SameMemoryMapping,force);
+  veceli_ = (lcv ==  ColumnVector ) ?  marowi_ : macoli_;
 }
 
 // $CHECK$ Reza 03/2000  Doit-on declarer cette methode const ?
 template <class T>
-TVector<T> TVector<T>::operator () (Range relt) const
+TVector<T> TVector<T>::SubVector(Range relt) const
 {
   Range rr, cr;
@@ -109 +117 @@
 }
 
+template <class T>
+string TVector<T>::InfoString() const
+{
+  string rs = "TVector<";
+  rs += typeid(T).name();
+  char buff[64];
+  sprintf(buff, ">(%ld) (nr=%ld, nc=%ld)", (long)NElts(), (long)NRows(), (long)NCols());
+  rs += buff;
+  return(rs);  
+
+}
 
 ///////////////////////////////////////////////////////////////