Changeset 804 in Sophya for trunk/SophyaLib/TArray/basarr.h

Timestamp:

Apr 3, 2000, 7:36:01 PM (25 years ago)

Author:

ansari

Message:

Amelioation / debugging de la classe TArray<T> - TVector et TMatrix

heritent maintenant de TArray<T> - Classe RCMatrix rendu prive au fichier
sopemtx.cc - linfit.cc integre a sopemtx.cc

Reza 03/04/2000

File:

• trunk/SophyaLib/TArray/basarr.h (modified) (6 diffs)

trunk/SophyaLib/TArray/basarr.h

@@ -21 +21 @@
 class BaseArray : public AnyDataObj {
 public:
+  //  To define Array / Matrix memory mapping
+  enum { AutoMemoryMapping = -1, SameMemoryMapping = 0, 
+         CMemoryMapping = 1, FortranMemoryMapping = 2 };
+
+  //    Max Nb of printed elements
+  static void    SetMaxPrint(uint_4 nprt=50);   
+  //   Memory organisation (for matrices)
+  static short   SetDefaultMemoryMapping(short mm=CMemoryMapping);
+  static inline short GetDefaultMemoryMapping() { return default_memory_mapping; }
+  
   // Creation / destruction 
   BaseArray();
@@ -44 +54 @@
 
   // memory organisation - packing information
+  inline short  GetMemoryMapping() const 
+                {return ( (marowi_ == 1) ? CMemoryMapping : FortranMemoryMapping) ; }
+
+  inline uint_4 RowsKA() const {return marowi_; }    // Dimension correspondant aux lignes
+  inline uint_4 ColsKA() const {return macoli_; }    // Dimension correspondant aux colonnes
+  inline uint_4 VectKA() const {return veceli_; }    // Dimension corr. aux elts d'un vecteur
+
   inline bool   IsPacked() const { return(moystep_ == 1); }
   inline bool   IsPackedX() const { return(step_[0] == 1); }
@@ -66 +83 @@
 
 // Impression, I/O, ...
-  static void   SetMaxPrint(uint_4 nprt=50);   
-  void          Show(ostream& os, bool si=false) const;
-  inline void   Show() const { Show(cout); }
+  void           Show(ostream& os, bool si=false) const;
+  inline void    Show() const { Show(cout); }
   virtual string DataType() const = 0;
 
@@ -83 +99 @@
   bool UpdateSizes(uint_4 ndim, const uint_4 * siz, const uint_4 * step, uint_8 offset, string & exmsg);
   bool UpdateSizes(const BaseArray& a, string & exmsg);
-  static uint_8 ComputeTotalSize(uint_4 ndim, uint_4 * siz, uint_4 step, uint_8 offset) ;
-  // Pour Extraction de sous-tableau
-  virtual void SubArray(BaseArray & ra, uint_4 ndim, uint_4 * siz, uint_4 * pos, uint_4 * step);
+  static uint_8 ComputeTotalSize(uint_4 ndim, const uint_4 * siz, uint_4 step, uint_8 offset) ;
+  //  Organisation memoire
+  static short SelectMemoryMapping(short mm);
+  void UpdateMemoryMapping(short mm, uint_4 & nx, uint_4 & ny);
+  void UpdateMemoryMapping(BaseArray const & a, short mm);
+
+  // Pour Extraction de sous-tableau 
+  virtual void UpdateSubArraySizes(BaseArray & ra, uint_4 ndim, uint_4 * siz, uint_4 * pos, uint_4 * step) const;
 
   uint_4 ndim_;                   // nb of dimensions
@@ -95 +116 @@
   uint_8 offset_;              // global offset -> position of elem[0] in DataBlock
   uint_4 marowi_, macoli_;     // For matrices, Row index and column index in dimensions
+  uint_4 veceli_;              // For vectors,  dimension index = marowi_/macoli_ (Row/Col vectors)
 
   DVList* mInfo;               // Infos (variables) attachees au tableau
@@ -100 +122 @@
   static char * ck_op_msg_[6];  // Operation messages for CheckDI() CheckBound()
   static uint_4 max_nprt_;      // Nb maxi d'elements imprimes
+  static short default_memory_mapping;  // Default memory mapping
 };