Changeset 1389 in Sophya

Timestamp:

Feb 9, 2001, 6:08:35 PM (25 years ago)

Author:

ansari

Message:

Correction bug initialisation vecteur ligne / colonne , Reza 9/2/2001

Location:

trunk/SophyaLib/TArray

Files:

• basarr.cc (modified) (1 diff)
• basarr.h (modified) (1 diff)
• tarray.cc (modified) (2 diffs)

trunk/SophyaLib/TArray/basarr.cc

@@ -192 +192 @@
     // Choix automatique Vecteur ligne ou colonne
     if ( size_[macoli_] == 1)  veceli_ = marowi_;
-    else veceli_ = marowi_;
+    else veceli_ = macoli_;
   }
   else veceli_ = (vt ==  ColumnVector ) ?  marowi_ : macoli_;

trunk/SophyaLib/TArray/basarr.h

@@ -69 +69 @@
 
   // Array dimensions
-  //! Return number of dimensions
+  //! Return number of dimensions (array rank)
   inline int_4 NbDimensions() const { return( ndim_ ); }
+  //! Return array rank (number of dimensions) 
+  inline int_4 Rank() const { return( ndim_ ); }
 
   //! Return total size of the array

trunk/SophyaLib/TArray/tarray.cc

@@ -16 +16 @@
   This class implements arrays of dimensions up to
   \ref BASEARRAY_MAXNDIMS "BASEARRAY_MAXNDIMS"
+*/
+
+/*! \ingroup TArray
+  \typedef sa_size_t
+  \brief Array index range and size, defined to be a 4-byte or 8-byte integer 
 */
 
@@ -264 +269 @@
   string exmsg = "TArray<T>::Realloc()";
   if (!UpdateSizes(ndim, siz, step, 0, exmsg))  throw( ParmError(exmsg) );
-  mNDBlock.ReSize(totsize_);    
+  mNDBlock.Realloc(totsize_, force);    
 }