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

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/basarr.h (modified) (5 diffs)

trunk/SophyaLib/TArray/basarr.h

@@ -62 +62 @@
 
   // Returns true if ndim and sizes are equal
-  virtual bool CompareSizes(const BaseArray& a);
+  virtual bool CompareSizes(const BaseArray& a, bool& smo);
 
   // Compacts \b size=1 array dimensions
@@ -83 +83 @@
   inline uint_4 Size(int ka) const { return(size_[CheckDI(ka,1)]); }
 
-  uint_4 MaxSizeKA() const ;
+  int MaxSizeKA() const ;
 
   //! Get memory organization
-  inline short GetMemoryMapping() const 
+  inline short  GetMemoryMapping() const 
          { return ( (marowi_ == 1) ? CMemoryMapping : FortranMemoryMapping) ; }
   //! line index dimension
-  inline uint_4 RowsKA() const {return marowi_; }
+  inline int    RowsKA() const {return marowi_; }
   //! column index dimension
-  inline uint_4 ColsKA() const {return macoli_; }
+  inline int    ColsKA() const {return macoli_; }
   //! Index dimension of the elements of a vector
-  inline uint_4 VectKA() const {return veceli_; }
+  inline int    VectKA() const {return veceli_; }
   void          SetMemoryMapping(short mm=AutoMemoryMapping);
 
@@ -126 +126 @@
   inline uint_4 Step(int ka) const { return(step_[CheckDI(ka,3)]); }
 
-  uint_4 MinStepKA() const ;
+  int MinStepKA() const ;
 
   // Offset of element ip
@@ -137 +137 @@
   virtual MuTyV & ValueAtPosition(uint_8 ip) const = 0;
 
- // Impression, I/O, ...
+  // Pour recuperer pas et numero d'axe pour operations sur deux arrays
+  void   GetOpeParams(const BaseArray& a, bool smo, int& ax, int& axa, uint_8& step,
+                      uint_8& stepa, uint_8& gpas, uint_8& naxa);
+  // Impression, I/O, ...
   void           Show(ostream& os, bool si=false) const;
   //! Show information on \b cout
@@ -166 +169 @@
   uint_4 size_[BASEARRAY_MAXNDIMS]; //!< array of the size in each dimension
   uint_8 totsize_; //!< Total number of elements
+  uint_8 offset_;  //!< global offset -\> position of elem[0] in DataBlock
   //! two consecutive elements distance in a given dimension 
   uint_4 step_[BASEARRAY_MAXNDIMS];
   uint_4 minstep_; //!< minimal step (in any axes)
   uint_4 moystep_; //!< mean step, if == 0 --\> non regular steps
-  uint_8 offset_;  //!< global offset -\> position of elem[0] in DataBlock
-  uint_4 marowi_; //!< For matrices, Row index in dimensions
-  uint_4 macoli_; //!< For matrices, Column index in dimensions
-  uint_4 veceli_; //!< For vectors, dimension index = marowi_/macoli_ (Row/Col vectors)
-  bool ck_memo_vt_; //!< if true, check MemoryOrg./VectorType for CompareSize
+  int_2  marowi_; //!< For matrices, Row index in dimensions
+  int_2  macoli_; //!< For matrices, Column index in dimensions
+  int_2  veceli_; //!< For vectors, dimension index = marowi_/macoli_ (Row/Col vectors)
+  int_2 arrtype_; //!< 0 a TArray, 1 TMatrix , 2 TVector
   DVList* mInfo;    //!< Infos (variables) attached to the array