Changeset 1103 in Sophya for trunk/SophyaLib/TArray/tmatrix.h

Timestamp:

Jul 27, 2000, 2:00:10 AM (25 years ago)

Author:

ansari

Message:

Suite operations entre matrices de <> MemOrg, Amelioration des Sequences - Reza 27/7/2000

File:

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

trunk/SophyaLib/TArray/tmatrix.h

@@ -82 +82 @@
 
   // = : fill matrix with a Sequence \b seq
-  inline  TMatrix<T>&  operator = (Sequence seq)    { SetSeq(seq); return(*this); }
+  inline  TMatrix<T>&  operator = (Sequence const & seq)    { SetSeq(seq); return(*this); }
 
   // Operations diverses  avec une constante
@@ -137 +137 @@
               r*step_[marowi_] + c*step_[macoli_] ) );
 }
+////////////////////////////////////////////////////////////////
+// Surcharge d'operateurs A (+,-,*,/) (T) x
+
+/*! \ingroup TMatrix \fn operator+(const TMatrix<T>&,T)
+  \brief Operator TMatrix = TMatrix + constant */
+template <class T> inline TMatrix<T> operator + (const TMatrix<T>& a, T b)
+    {TMatrix<T> result; result.CloneOrShare(a); result.SetTemp(true); 
+    result.Add(b); return result;}
+
+/*! \ingroup TMatrix \fn operator+(T,const TMatrix<T>&)
+  \brief Operator TMatrix = constant + TMatrix */
+template <class T> inline TMatrix<T> operator + (T b,const TMatrix<T>& a)
+    {TMatrix<T> result; result.CloneOrShare(a); result.SetTemp(true); 
+    result.Add(b); return result;}
+
+/*! \ingroup TMatrix \fn operator-(const TMatrix<T>&,T)
+  \brief Operator TMatrix = TMatrix - constant */
+template <class T> inline TMatrix<T> operator - (const TMatrix<T>& a, T b)
+    {TMatrix<T> result; result.CloneOrShare(a); result.SetTemp(true); 
+    result.Sub(b); return result;}
+
+/*! \ingroup TMatrix \fn operator-(T,const TMatrix<T>&)
+  \brief Operator TMatrix = constant - TMatrix */
+template <class T> inline TMatrix<T> operator - (T b,const TMatrix<T>& a)
+    {TMatrix<T> result; result.CloneOrShare(a); result.SetTemp(true); 
+    result.Sub(b,true); return result;}
+
+/*! \ingroup TMatrix \fn operator*(const TMatrix<T>&,T)
+  \brief Operator TMatrix = TMatrix * constant */
+template <class T> inline TMatrix<T> operator * (const TMatrix<T>& a, T b)
+    {TMatrix<T> result; result.CloneOrShare(a); result.SetTemp(true); 
+    result.Mul(b); return result;}
+
+/*! \ingroup TMatrix \fn operator*(T,const TMatrix<T>&)
+  \brief Operator TMatrix = constant * TMatrix */
+template <class T> inline TMatrix<T> operator * (T b,const TMatrix<T>& a)
+    {TMatrix<T> result; result.CloneOrShare(a); result.SetTemp(true); 
+    result.Mul(b); return result;}
+
+/*! \ingroup TMatrix \fn operator/(const TMatrix<T>&,T)
+  \brief Operator TMatrix = TMatrix / constant */
+template <class T> inline TMatrix<T> operator / (const TMatrix<T>& a, T b)
+    {TMatrix<T> result; result.CloneOrShare(a); result.SetTemp(true); 
+    result.Div(b); return result;}
+
+/*! \ingroup TMatrix \fn operator/(T,const TMatrix<T>&)
+  \brief Operator TMatrix = constant / TMatrix  */
+template <class T> inline TMatrix<T> operator / (T b, const TMatrix<T>& a)
+    {TMatrix<T> result; result.CloneOrShare(a); result.SetTemp(true); 
+    result.Div(b, true); return result;}
+
 
 // Surcharge d'operateurs C = A (+,-) B