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

Timestamp:

Aug 29, 2000, 6:10:32 PM (25 years ago)

Author:

ansari

Message:

Introduction du type sa_size_t (taille des tableaux), operateur - (TArray::operator - et NegateElt()) - Reza 29/8/2000

File:

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

trunk/SophyaLib/TArray/tmatrix.cc

@@ -1 @@
-// $Id: tmatrix.cc,v 1.15 2000-07-27 00:00:09 ansari Exp $
+// $Id: tmatrix.cc,v 1.16 2000-08-29 16:10:30 ansari Exp $
 //                         C.Magneville          04/99
 #include "machdefs.h"
@@ -33 +33 @@
  */
 template <class T>
-TMatrix<T>::TMatrix(uint_4 r,uint_4 c, short mm)
+TMatrix<T>::TMatrix(sa_size_t r,sa_size_t c, short mm)
 // Construit une matrice de r lignes et c colonnes.
   :  TArray<T>() 
 {
   if ( (r == 0) || (c == 0) )
-    throw ParmError("TMatrix<T>::TMatrix(uint_4 r,uint_4 c) NRows or NCols = 0");
+    throw ParmError("TMatrix<T>::TMatrix(sa_size_t r,sa_size_t c) NRows or NCols = 0");
   arrtype_ = 1;   // Type = Matrix
   ReSize(r, c, mm);
@@ -175 +175 @@
  */
 template <class T>
-void TMatrix<T>::ReSize(uint_4 r, uint_4 c, short mm)
+void TMatrix<T>::ReSize(sa_size_t r, sa_size_t c, short mm)
 {
   if(r==0||c==0) 
@@ -181 +181 @@
   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;
+  sa_size_t size[BASEARRAY_MAXNDIMS];
+  for(int_4 kk=0; kk<BASEARRAY_MAXNDIMS; kk++)  size[kk] = 0;
   if (mm == SameMemoryMapping) mm = GetMemoryMapping();  
   else if ( (mm != CMemoryMapping) && (mm != FortranMemoryMapping) ) 
@@ -206 +206 @@
  */
 template <class T>
-void TMatrix<T>::Realloc(uint_4 r,uint_4 c, short mm, bool force)
+void TMatrix<T>::Realloc(sa_size_t r,sa_size_t c, short mm, bool force)
 {
   if(r==0||c==0) 
@@ -212 +212 @@
   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;
+  sa_size_t size[BASEARRAY_MAXNDIMS];
+  for(int_4 kk=0; kk<BASEARRAY_MAXNDIMS; kk++)  size[kk] = 0;
   if (mm == SameMemoryMapping) mm = GetMemoryMapping();  
   else if ( (mm != CMemoryMapping) && (mm != FortranMemoryMapping) ) 
@@ -249 +249 @@
 {
   short vt = (marowi_ == veceli_) ? ColumnVector : RowVector;
-  uint_4 rci = macoli_;
+  int_4 rci = macoli_;
   macoli_ = marowi_;
   marowi_ = rci;
@@ -268 +268 @@
   if (mm == SameMemoryMapping) mm = GetMemoryMapping();  
   TMatrix<T> tm(NCols(), NRows(), mm);
-  for(uint_4 i=0; i<NRows(); i++)
-    for(uint_4 j=0; j<NCols(); j++) 
+  for(sa_size_t i=0; i<NRows(); i++)
+    for(sa_size_t j=0; j<NCols(); j++) 
       tm(j,i) = (*this)(i,j);
   tm.SetTemp(true);
@@ -292 +292 @@
   
   TMatrix<T> tm(NRows(), NCols(), mm);
-  for(uint_4 i=0; i<NRows(); i++)
-    for(uint_4 j=0; j<NCols(); j++) 
+  for(sa_size_t i=0; i<NRows(); i++)
+    for(sa_size_t j=0; j<NCols(); j++) 
       tm(i,j) = (*this)(i,j);
   tm.SetTemp(true);
@@ -304 +304 @@
 {
   if (ndim_ == 0) {
-    uint_4 sz = imx.Size();
+    sa_size_t sz = imx.Size();
     if (sz < 1) sz = 1;
     ReSize(sz, sz);
@@ -312 +312 @@
     throw SzMismatchError("TMatrix::operator= (IdentityMatrix) NRows() != NCols()") ;
   *this = (T) 0;
-  for(uint_4 i=0; i<NRows(); i++) (*this)(i,i) = diag;
+  for(sa_size_t i=0; i<NRows(); i++) (*this)(i,i) = diag;
 
   return (*this);
@@ -343 +343 @@
 {
   if (maxprt < 0)  maxprt = max_nprt_;
-  uint_4 npr = 0;
+  sa_size_t npr = 0;
   Show(os, si);
   if (ndim_ < 1)  return;
-  uint_4 kc,kr;  
+  sa_size_t kc,kr;  
   for(kr=0; kr<size_[marowi_]; kr++) {
     if ( (size_[marowi_] > 1) && (size_[macoli_] > 10) ) cout << "----- Ligne Line= " << kr << endl;
@@ -352 +352 @@
       if(kc > 0) os << ", ";  
       os << (*this)(kr, kc);   npr++; 
-      if (npr >= (uint_4) maxprt) {
+      if (npr >= (sa_size_t) maxprt) {
         if (npr < totsize_)  os << "\n     .... " << endl; return;
       }
@@ -380 +380 @@
   const T * peb;
   T sum;
-  uint_4 r,c,k;
-  uint_4 stepa = Step(ColsKA());
-  uint_4 stepb = b.Step(RowsKA());
+  sa_size_t r,c,k;
+  sa_size_t stepa = Step(ColsKA());
+  sa_size_t stepb = b.Step(RowsKA());
   // Calcul de C=rm = A*B   (A=*this)
   for(r=0; r<rm.NRows(); r++)      // Boucle sur les lignes de A