Changeset 1099 in Sophya for trunk/SophyaLib/TArray/tmatrix.cc

Timestamp:

Jul 26, 2000, 6:29:46 PM (25 years ago)

Author:

ansari

Message:

Protection integrite TMatrix,TVector - operateur = (BaseArray & pour TVector et operations entre matrices avec <> MemMapping (Pas termine) Reza 27/6/2000

File:

• trunk/SophyaLib/TArray/tmatrix.cc (modified) (11 diffs)

trunk/SophyaLib/TArray/tmatrix.cc

@@ -1 @@
-// $Id: tmatrix.cc,v 1.13 2000-07-24 12:51:27 ansari Exp $
+// $Id: tmatrix.cc,v 1.14 2000-07-26 16:29:45 ansari Exp $
 //                         C.Magneville          04/99
 #include "machdefs.h"
@@ -22 +22 @@
   : TArray<T>()
 {
-  ck_memo_vt_ = true;
+  arrtype_ = 1;   // Type = Matrix
 }
 
@@ -39 +39 @@
   if ( (r == 0) || (c == 0) )
     throw ParmError("TMatrix<T>::TMatrix(uint_4 r,uint_4 c) NRows or NCols = 0");
+  arrtype_ = 1;   // Type = Matrix
   ReSize(r, c, mm);
 }
@@ -52 +53 @@
   : TArray<T>(a)
 {
+  arrtype_ = 1;   // Type = Matrix
 }
 
@@ -63 +65 @@
 : TArray<T>(a, share)
 {
+  arrtype_ = 1;   // Type = Matrix
 }
 
@@ -77 +80 @@
     ndim_ = 2;
   }
+  arrtype_ = 1;   // Type = Matrix
   UpdateMemoryMapping(a, SameMemoryMapping);
 }
@@ -97 +101 @@
     ndim_ = 2;
   }
+  arrtype_ = 1;   // Type = Matrix
   UpdateMemoryMapping(a, mm);
 }
 
+//! 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
   SetBA(a);
 }
@@ -125 +132 @@
   if (a.NbDimensions() > 2) 
     throw SzMismatchError("TMatrix<T>::Set(const TArray<T>& a) a.NbDimensions() > 2");
+  if ((arrtype_ == 2) && (a.NbDimensions() > 1) && (a.Size(0) > 1) && (a.Size(1) > 1) )
+    throw SzMismatchError("TMatrix<T>::Set(const TArray<T>& a) Size(0,1)>1 for Vector");
   TArray<T>::Set(a);
   if (NbDimensions() == 1) {
@@ -140 +149 @@
   if (a.NbDimensions() > 2) 
     throw SzMismatchError("TMatrix<T>::SetBA(const BaseArray& a) a.NbDimensions() > 2");
+  if ((arrtype_ == 2) && (a.NbDimensions() > 1) && (a.Size(0) > 1) && (a.Size(1) > 1) )
+    throw SzMismatchError("TMatrix<T>::Set(const TArray<T>& a) Size(0,1)>1 for Vector");
   TArray<T>::SetBA(a);
   if (NbDimensions() == 1) {
@@ -165 +176 @@
   if(r==0||c==0) 
     throw(SzMismatchError("TMatrix::ReSize r or c==0 "));
+  if ((arrtype_ == 2) && (r > 1) && (c > 1))
+    throw(SzMismatchError("TMatrix::ReSize r>1&&c>1 for Vector "));
   uint_4 size[BASEARRAY_MAXNDIMS];
   for(int kk=0; kk<BASEARRAY_MAXNDIMS; kk++)  size[kk] = 0;
@@ -194 +207 @@
   if(r==0||c==0) 
     throw(SzMismatchError("TMatrix::Realloc r or c==0 "));
+  if ((arrtype_ == 2) && (r > 1) && (c > 1))
+    throw(SzMismatchError("TMatrix::Realloc r>1&&c>1 for Vector "));
   uint_4 size[BASEARRAY_MAXNDIMS];
   for(int kk=0; kk<BASEARRAY_MAXNDIMS; kk++)  size[kk] = 0;