Changeset 2421 in Sophya

Timestamp:

Aug 8, 2003, 3:07:06 PM (22 years ago)

Author:

ansari

Message:

• Modifications methodes TMatrix::NRows() ::NCols() --> Peuvent etre

appelees sur des matrices non allouees.

• Declaration const pour TMatrix::Transpose() et ::Rearrange(..)
• remplacement THROW par throw ds Linfitter avec message explicite

Reza 08/08/2003

Location:

trunk/SophyaLib/TArray

Files:

• sopemtx.cc (modified) (6 diffs)
• tmatrix.cc (modified) (4 diffs)
• tmatrix.h (modified) (2 diffs)

trunk/SophyaLib/TArray/sopemtx.cc

@@ -619 +619 @@
 {
 uint_4 n = x.NElts();
-if (n != y.NElts()) THROW(sizeMismatchErr);
+if (n != y.NElts()) 
+  throw SzMismatchError("LinFitter<T>::LinFit(x,y,nf,f,c)/Error x.NElts() <> y.Nelts() ");
  
 TMatrix<T> fx(nf,n);
@@ -643 +644 @@
 {
 uint_4 n = y.NElts();
-if (n != fx.NCol()) THROW(sizeMismatchErr);
+if (n != fx.NCol()) 
+  throw SzMismatchError("LinFitter<T>::LinFit(fx, y, c)/Error y.NElts() <> fx.Nelts() ");
 
 uint_4 nf = fx.NRows();
@@ -656 +658 @@
 c = fx * y;
 
-if(SimpleMatrixOperation<T>::GausPiv(a,c)==(T) 0) THROW(singMatxErr);
+if(SimpleMatrixOperation<T>::GausPiv(a,c)==(T) 0) 
+  throw SingMatrixExc("LinFitter<T>::LinFit(fx, y, c) - Non invertible matrix (by GausPiv())");
 
 r_8 xi2 = 0., ax;
@@ -691 +694 @@
 {
 uint_4 n = x.NElts();
-if (n != y.NElts()) THROW(sizeMismatchErr);
+if (n != y.NElts()) 
+  throw SzMismatchError("LinFitter<T>::LinFit(x,y,errY2,nf,f,c,errC)/Error x.NElts() <> y.Nelts() ");
 
 TMatrix<T> fx(nf, n);
@@ -720 +724 @@
 {
 uint_4 n = y.NElts();
-if( n != errY2.NElts()) THROW(sizeMismatchErr);
-if( n != fx.NCol()) THROW(sizeMismatchErr);
-
+if( n != errY2.NElts()) 
+  throw SzMismatchError("LinFitter<T>::LinFit(fx,y,errY2,c,errC)/Error y.NElts() <> errY2.Nelts() ");
+if( n != fx.NCol()) 
+  throw SzMismatchError("LinFitter<T>::LinFit(fx,y,errY2,c,errC)/Error y.NElts() <> fx.NCols() ");
 uint_4 nf = fx.NRows();
 
@@ -748 +753 @@
 }
 
-if(SimpleMatrixOperation<T>::GausPiv(a,d)==(T) 0) THROW(singMatxErr);
+if(SimpleMatrixOperation<T>::GausPiv(a,d)==(T) 0) 
+  throw SingMatrixExc("LinFitter<T>::LinFit(...ErrY2...) - Non invertible matrix (by GausPiv())");
+
 
 for(uint_4 l=0; l<nf; l++) {

trunk/SophyaLib/TArray/tmatrix.cc

@@ -1 @@
-// $Id: tmatrix.cc,v 1.23 2002-11-15 09:35:44 ansari Exp $
+// $Id: tmatrix.cc,v 1.24 2003-08-08 13:07:06 ansari Exp $
 //                         C.Magneville          04/99
 #include "machdefs.h"
@@ -291 +291 @@
  */
 template <class T>
-TMatrix<T> TMatrix<T>::Transpose()
+TMatrix<T> TMatrix<T>::Transpose() const
 {
   TMatrix<T> tm(*this);
@@ -305 +305 @@
  */
 template <class T>
-TMatrix<T> TMatrix<T>::Transpose(short mm)
+TMatrix<T> TMatrix<T>::Transpose(short mm) const
 {
   if (mm == SameMemoryMapping) mm = GetMemoryMapping();  
@@ -322 +322 @@
  */
 template <class T>
-TMatrix<T> TMatrix<T>::Rearrange(short mm)
+TMatrix<T> TMatrix<T>::Rearrange(short mm) const 
 {
   if ( mm == SameMemoryMapping)  mm = GetMemoryMapping();

trunk/SophyaLib/TArray/tmatrix.h

@@ -42 +42 @@
   // Size - Changing the Size 
   //! return number of rows
-  inline sa_size_t NRows() const {return Size(marowi_); }
+  inline sa_size_t NRows() const {return size_[marowi_]; }
   //! return number of columns
-  inline sa_size_t NCols() const {return Size(macoli_); }
+  inline sa_size_t NCols() const {return size_[macoli_]; }
   //! return number of columns
-  inline sa_size_t NCol()  const {return Size(macoli_); } // back-compat Peida
+  inline sa_size_t NCol()  const {return size_[macoli_]; } // back-compat Peida
 
   void ReSize(sa_size_t r,sa_size_t c, short mm=BaseArray::SameMemoryMapping);
@@ -74 +74 @@
   // Operations matricielles
   TMatrix<T>& TransposeSelf();
-  TMatrix<T>  Transpose();
+  TMatrix<T>  Transpose() const;
   //mm = SameMemoryMapping or CMemoryMapping or FortranMemoryMapping 
-  TMatrix<T>  Transpose(short mm); 
+  TMatrix<T>  Transpose(short mm) const ; 
   // Rearranging Matrix Elements
-  TMatrix<T>  Rearrange(short mm);
+  TMatrix<T>  Rearrange(short mm) const;
 
   // Operateur d'affectation