Changeset 1007 in Sophya for trunk/SophyaLib/TArray/sopemtx.h

Timestamp:

May 16, 2000, 7:54:20 PM (25 years ago)

Author:

ansari

Message:

gestion det dans GausPiv et new norm cmv 16/5/00

File:

• trunk/SophyaLib/TArray/sopemtx.h (modified) (6 diffs)

trunk/SophyaLib/TArray/sopemtx.h

@@ -27 +27 @@
 class SimpleMatrixOperation {
 public:
+  //! To define the type of data scaling for Gauss pivoting method (type T)
+  enum GausPivScal {
+    PIV_NO_SCALE = 0,   //!< do not scale datas for gauss pivoting
+    PIV_GLOB_SCALE = 1, //!< do a global scaling of datas for gauss pivoting (default)
+    PIV_ROW_SCALE = 2   //!< do a scaling by row of datas for gauss pivoting
+  };
+  static inline int SetGausPivScal(int gps = PIV_GLOB_SCALE)
+              { GausPivScaling = gps; return GausPivScaling; }
+
   static TMatrix<T> Inverse(TMatrix<T> const & A);
-  static T GausPiv(TMatrix<T>& A, TMatrix<T>& B);
+  static T GausPiv(TMatrix<T>& A, TMatrix<T>& B, bool computedet=false);
+
+protected:
+  static int GausPivScaling;
 };
 
@@ -47 +59 @@
 //------------------------------------------------------------
 /*! \ingroup TArray \fn LinSolveInPlace(TMatrix<T>&,TVector<T>&)
-    \brief  Solve A*C = B for C in place and return determinant
+    \brief  Solve A*C = B for C in place and return 1 if OK, 0 if not.
 */
 template <class T>
@@ -62 +74 @@
 /*! \ingroup TArray 
     \fn LinSolve(const TMatrix<T>&, const TVector<T>&, TVector<T>&)
-    \brief Solve A*C = B and return C and determinant
+    \brief Solve A*C = B and return C. Return 1 if OK, 0 if not.
 */
 template <class T>
@@ -86 +98 @@
 /*! \ingroup TArray 
     \fn Inverse(TMatrix<T> const &)
-    \brief To inverse a TMatrix
+    \brief To inverse a TMatrix.
 */
 template <class T>
@@ -94 +106 @@
 /*! \ingroup TArray 
     \fn Determinant(TMatrix<T> const &)
-    \brief Give the TMatrix determinant
+    \brief Return the TMatrix determinant
 */
 template <class T>
@@ -100 +112 @@
   TMatrix<T> a(A,false);
   TMatrix<T> b(a.NCols(),a.NRows());  b = IdentityMatrix(1.);
-  return SimpleMatrixOperation<T>::GausPiv(a,b);
+  return SimpleMatrixOperation<T>::GausPiv(a,b,true);
 }
 
 /*! \ingroup TArray 
-    \fn GausPiv(TMatrix<T> const &,TMatrix<T> &)
+    \fn GausPiv(TMatrix<T> const &,TMatrix<T> &, bool)
     \brief Gauss pivoting on matrix \b A, doing the same operations
-           on matrix \b B and return determinant of \b A.
-    \sa SOPHYA::SimpleMatrixOperation::GausPiv(TMatrix<T>&,TMatrix<T>&)
+           on matrix \b B.
+    \param computedet = true : return the determinant of \b A
+           (beware of over/underfloat), default is false.
+    \return determinant if requested, or 1 if OK.
+    \sa SOPHYA::SimpleMatrixOperation::GausPiv(TMatrix<T>&,TMatrix<T>&,bool)
 */
 template <class T>
-inline T GausPiv(TMatrix<T> const & A,TMatrix<T> & B) {
+inline T GausPiv(TMatrix<T> const & A,TMatrix<T> & B, bool computedet=false) {
   TMatrix<T> a(A,false);
-  return SimpleMatrixOperation<T>::GausPiv(a,B);
+  return SimpleMatrixOperation<T>::GausPiv(a,B,computedet);
 }