Changeset 2569 in Sophya for trunk/SophyaLib/TArray

Timestamp:

Jul 27, 2004, 1:44:24 PM (21 years ago)

Author:

ansari

Message:

Corrections bug apres modifs methods Add/Sub/Mul/DivCst(x,res) - Reza 27 Juillet 2004

Location:

trunk/SophyaLib/TArray

Files:

• tarray.cc (modified) (1 diff)
• tarray.h (modified) (8 diffs)

trunk/SophyaLib/TArray/tarray.cc

@@ -305 +305 @@
   if (pack) {
     sa_size_t siz[BASEARRAY_MAXNDIMS];
-    for(int ksz=0; ksz<BASEARRAY_MAXNDIMS; ksz++) siz[ksz] = a.Size(ksz);
+    int ksz;
+    for(ksz=0; ksz<a.NbDimensions(); ksz++) siz[ksz] = a.Size(ksz);
+    for(ksz=a.NbDimensions(); ksz<BASEARRAY_MAXNDIMS; ksz++) siz[ksz] = 1;
     if (!UpdateSizes(a.NbDimensions(), siz, 1, 0, exmsg))  throw( ParmError(exmsg) );
+    SetMemoryMapping(a.GetMemoryMapping());
     mNDBlock.ReSize(totsize_, fzero);        
   }

trunk/SophyaLib/TArray/tarray.h

@@ -58 +58 @@
 
   void ReSize(int_4 ndim, sa_size_t * siz, sa_size_t step=1, bool fzero=true);
-  void ReSize(const BaseArray& a, bool pack=true, bool fzero=true);
+  void ReSize(const BaseArray& a, bool pack=false, bool fzero=true);
   //! a synonym (alias) for method ReSize(int_4, ...)
   inline void SetSize(int_4 ndim, sa_size_t * siz, sa_size_t step=1, bool fzero=true)
                 { ReSize(ndim, siz, step, fzero); }
   //! a synonym (alias) for method ReSize(const BaseArray&)
-  inline void SetSize(const BaseArray& a, bool pack=true, bool fzero=true)
+  inline void SetSize(const BaseArray& a, bool pack=false, bool fzero=true)
                 { ReSize(a, pack, fzero); }
   void Realloc(int_4 ndim, sa_size_t * siz, sa_size_t step=1, bool force=false);
@@ -221 +221 @@
 template <class T> inline TArray<T> operator + (const TArray<T>& a, T b)
     {TArray<T> result; result.SetTemp(true); 
-    a.Add(b, result); return result;}
+    a.AddCst(b, result); return result;}
 
 /*! \ingroup TArray \fn operator+(T,const TArray<T>&)
@@ -227 +227 @@
 template <class T> inline TArray<T> operator + (T b,const TArray<T>& a)
     {TArray<T> result; result.SetTemp(true); 
-    a.Add(b, result); return result;}
+    a.AddCst(b, result); return result;}
 
 /*! \ingroup TArray \fn operator-(const TArray<T>&,T)
@@ -233 +233 @@
 template <class T> inline TArray<T> operator - (const TArray<T>& a, T b)
     {TArray<T> result; result.SetTemp(true); 
-    a.Sub(b,result); return result;}
+    a.SubCst(b,result); return result;}
 
 /*! \ingroup TArray \fn operator-(T,const TArray<T>&)
@@ -239 +239 @@
 template <class T> inline TArray<T> operator - (T b,const TArray<T>& a)
     {TArray<T> result; result.SetTemp(true); 
-    a.Sub(b,result,true); return result;}
+    a.SubCst(b,result,true); return result;}
 
 /*! \ingroup TArray \fn operator*(const TArray<T>&,T)
@@ -257 +257 @@
 template <class T> inline TArray<T> operator / (const TArray<T>& a, T b)
     {TArray<T> result; result.SetTemp(true); 
-    a.Div(b,result); return result;}
+    a.DivCst(b,result); return result;}
 
 /*! \ingroup TArray \fn operator/(T,const TArray<T>&)
@@ -263 +263 @@
 template <class T> inline TArray<T> operator / (T b, const TArray<T>& a)
     {TArray<T> result; result.SetTemp(true); 
-    a.Div(b, result, true); return result;}
+    a.DivCst(b, result, true); return result;}
 
 ////////////////////////////////////////////////////////////////
@@ -272 +272 @@
   the original array elements.  */
 template <class T> inline TArray<T> operator - (const TArray<T>& a)
-    {TArray<T> result; result.CloneOrShare(a); result.SetTemp(true); 
-    result.NegateElt(); return result;}
+    {TArray<T> result; result.SetTemp(true); 
+    a.NegateElt(result); return result;}
 
 ////////////////////////////////////////////////////////////////