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

Timestamp:

Apr 24, 2006, 4:25:14 PM (19 years ago)

Author:

ansari

Message:

Ajout operateur && et / (MulElt DivElt) pour TArray (.h) et partage (Share) lors des operations Add/Mul/Sub/DivCst et Add/Mul/Sub/DivElt (.cc) - Reza 24/4/2006

File:

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

trunk/SophyaLib/TArray/tarray.h

@@ -298 +298 @@
 
 ////////////////////////////////////////////////////////////////
-// Surcharge d'operateurs C = A (+,-) B
+// Surcharge d'operateurs C = A (+,-,&&,/) B
 
 /*! \ingroup TArray \fn operator+(const TArray<T>&,const TArray<T>&)
@@ -314 +314 @@
     a.SubElt(b, result);    return result; }
 
-/*! \ingroup TArray \fn MultiplyElt((const TArray<T>&,const TArray<T>&)
+/*! \ingroup TArray \fn operator && (const TArray<T>&,const TArray<T>&)
   \brief Element by element multiplication of two arrays TArray = TArray * TArray */
 
 template <class T>
-inline TArray<T> MultiplyElt(const TArray<T>& a,const TArray<T>& b)
+inline TArray<T> operator && (const TArray<T>& a,const TArray<T>& b)
     { TArray<T> result; result.SetTemp(true); 
     a.MulElt(b, result);    return result; }
 
-/*! \ingroup TArray \fn DivideElt((const TArray<T>&,const TArray<T>&)
-  \brief Element by element division of two arrays TArray = TArray * TArray */
-template <class T>
-inline TArray<T> DivideElt(const TArray<T>& a,const TArray<T>& b, bool divzero=false)
+/*! \ingroup TArray \fn operator / (const TArray<T>&,const TArray<T>&)
+  \brief Element by element division of two arrays TArray = TArray / TArray */
+template <class T>
+inline TArray<T> operator / (const TArray<T>& a,const TArray<T>& b)
     { TArray<T> result; result.SetTemp(true); 
-    a.DivElt(b, result, false, divzero);    return result; }
+    a.DivElt(b, result, false, false);    return result; }
 
 // --------------------------------------------------