Changeset 970 in Sophya for trunk/SophyaLib/TArray/tarray.h

Timestamp:

Apr 26, 2000, 7:55:11 PM (25 years ago)

Author:

ansari

Message:

Passage des TArray en partage de donnees par defaut pour constructeur de copie - Copie pour l'operateur = , cmv+Reza 26/4/2000

File:

• trunk/SophyaLib/TArray/tarray.h (modified) (8 diffs)

trunk/SophyaLib/TArray/tarray.h

@@ -46 +46 @@
   // Gestion taille/Remplissage
   virtual void Clone(const TArray<T>& a); 
+  // partage les donnees si "a" temporaire, clone sinon.
+  void CloneOrShare(const TArray<T>& a);
+  // Share: partage les donnees de "a"
+
+  void Share(const TArray<T>& a);
   void ReSize(uint_4 ndim, uint_4 * siz, uint_4 step=1);
   void Realloc(uint_4 ndim, uint_4 * siz, uint_4 step=1, bool force=false);
@@ -122 +127 @@
   //! Add \b x to all elements
   inline  TArray<T>&  operator += (T x)            { return Add(x); }
-  virtual TArray<T>&  Sub(T x);
+  virtual TArray<T>&  Sub(T x, bool fginv=false);
   //! Substract \b x to all elements
   inline  TArray<T>&  operator -= (T x)            { return Sub(x); }
@@ -128 +133 @@
   //! Multiply all elements by \b x
   inline  TArray<T>&  operator *= (T x)            { return Mul(x); }
-  virtual TArray<T>&  Div(T x);
+  virtual TArray<T>&  Div(T x, bool fginv=false);
   //! Divide all elements by \b x
   inline  TArray<T>&  operator /= (T x)            { return Div(x); }
-  virtual TArray<T>&  SubInv(T x);  //   A ---> x-A
-  virtual TArray<T>&  DivInv(T x);  //   A ---> x/A
 
 // A += -=  (ajoute, soustrait element par element les deux tableaux )
@@ -138 +141 @@
   //! Operator TArray += TArray
   inline  TArray<T>&  operator += (const TArray<T>& a)  { return AddElt(a); }
-  virtual TArray<T>&  SubElt(const TArray<T>& a);
+  virtual TArray<T>&  SubElt(const TArray<T>& a, bool fginv=false);
   //! Operator TArray -= TArray
   inline  TArray<T>&  operator -= (const TArray<T>& a)  { return SubElt(a); }
 // Multiplication, division element par element les deux tableaux 
   virtual TArray<T>&  MulElt(const TArray<T>& a);
-  virtual TArray<T>&  DivElt(const TArray<T>& a);
+  virtual TArray<T>&  DivElt(const TArray<T>& a, bool fginv=false);
 // Recopie des valeurs, element par element
   virtual TArray<T>&  CopyElt(const TArray<T>& a);
@@ -159 +162 @@
 
 protected:
-  // partage les donnees si "a" temporaire, clone sinon.
-  void CloneOrShare(const TArray<T>& a);
-  // Share: partage les donnees de "a"
-  void Share(const TArray<T>& a);
 
   NDataBlock<T> mNDBlock; //!< Block for datas
@@ -180 +179 @@
   \brief Operator TArray = TArray + constant */
 template <class T> inline TArray<T> operator + (const TArray<T>& a, T b)
-    {TArray<T> result(a); result.SetTemp(true); result.Add(b); return result;}
+    {TArray<T> result; result.CloneOrShare(a); result.SetTemp(true); 
+    result.Add(b); return result;}
 
 /*! \ingroup TArray \fn operator+(T,const TArray<T>&)
   \brief Operator TArray = constant + TArray */
 template <class T> inline TArray<T> operator + (T b,const TArray<T>& a)
-    {TArray<T> result(a); result.SetTemp(true); result.Add(b); return result;}
+    {TArray<T> result; result.CloneOrShare(a); result.SetTemp(true); 
+    result.Add(b); return result;}
 
 /*! \ingroup TArray \fn operator-(const TArray<T>&,T)
   \brief Operator TArray = TArray - constant */
 template <class T> inline TArray<T> operator - (const TArray<T>& a, T b)
-    {TArray<T> result(a); result.SetTemp(true); result.Sub(b); return result;}
+    {TArray<T> result; result.CloneOrShare(a); result.SetTemp(true); 
+    result.Sub(b); return result;}
 
 /*! \ingroup TArray \fn operator-(T,const TArray<T>&)
   \brief Operator TArray = constant - TArray */
 template <class T> inline TArray<T> operator - (T b,const TArray<T>& a)
-    {TArray<T> result(a); result.SetTemp(true); result.SubInv(b); return result;}
+    {TArray<T> result; result.CloneOrShare(a); result.SetTemp(true); 
+    result.Sub(b,true); return result;}
 
 /*! \ingroup TArray \fn operator*(const TArray<T>&,T)
   \brief Operator TArray = TArray * constant */
 template <class T> inline TArray<T> operator * (const TArray<T>& a, T b)
-    {TArray<T> result(a); result.SetTemp(true); result.Mul(b); return result;}
+    {TArray<T> result; result.CloneOrShare(a); result.SetTemp(true); 
+    result.Mul(b); return result;}
 
 /*! \ingroup TArray \fn operator*(T,const TArray<T>&)
   \brief Operator TArray = constant * TArray */
 template <class T> inline TArray<T> operator * (T b,const TArray<T>& a)
-    {TArray<T> result(a); result.SetTemp(true); result.Mul(b); return result;}
+    {TArray<T> result; result.CloneOrShare(a); result.SetTemp(true); 
+    result.Mul(b); return result;}
 
 /*! \ingroup TArray \fn operator/(const TArray<T>&,T)
   \brief Operator TArray = TArray / constant */
 template <class T> inline TArray<T> operator / (const TArray<T>& a, T b)
-    {TArray<T> result(a); result.SetTemp(true); result.DivInv(b); return result;}
+    {TArray<T> result; result.CloneOrShare(a); result.SetTemp(true); 
+    result.Div(b); return result;}
+
+/*! \ingroup TArray \fn operator/(T,const TArray<T>&)
+  \brief Operator TArray = constant / TArray  */
+template <class T> inline TArray<T> operator / (T b, const TArray<T>& a)
+    {TArray<T> result; result.CloneOrShare(a); result.SetTemp(true); 
+    result.Div(b, true); return result;}
 
 ////////////////////////////////////////////////////////////////
@@ -219 +231 @@
 template <class T>
 inline TArray<T> operator + (const TArray<T>& a,const TArray<T>& b)
-    {TArray<T> result(a); result.SetTemp(true); result.AddElt(b); return result;}
+    { TArray<T> result; result.SetTemp(true); 
+    if (b.IsTemp())  { result.Share(b); result.AddElt(a); }
+    else { result.CloneOrShare(a); result.AddElt(b); }
+    return result; }
 
 /*! \ingroup TArray \fn operator-(const TArray<T>&,const TArray<T>&)
@@ -225 +240 @@
 template <class T>
 inline TArray<T> operator - (const TArray<T>& a,const TArray<T>& b)
-    {TArray<T> result(a); result.SetTemp(true); result.SubElt(b); return result;}
+    { TArray<T> result; result.SetTemp(true); 
+    if (b.IsTemp())  { result.Share(b); result.SubElt(a, true); }
+    else { result.CloneOrShare(a); result.SubElt(b); }
+    return result; }