Changeset 514 in Sophya for trunk/SophyaLib/NTools/linfit.cc

Timestamp:

Oct 25, 1999, 6:43:04 PM (26 years ago)

Author:

ansari

Message:

elimination des OVector/OMatrix au profit des TVector/TMatrix cmv 25/10/99

File:

• trunk/SophyaLib/NTools/linfit.cc (modified) (9 diffs)

trunk/SophyaLib/NTools/linfit.cc

@@ -2 +2 @@
 #include "peida.h"
 #include "linfit.h"
-#include "matrix.h"
-#include "cvector.h"
 
-double LinFit(const OVector& x, const OVector& y, int nf, double (*f)(int, double), 
-           OVector& c)
+double LinFit(const Vector& x, const Vector& y, int nf, double (*f)(int, double), 
+           Vector& c)
 {
   int n = x.NElts();
   if (n != y.NElts()) THROW(sizeMismatchErr);
   
-  OMatrix fx(nf, n);
+  Matrix fx(nf, n);
   for (int i=0; i<nf; i++)
     for (int j=0; j<n; j++)
@@ -21 +19 @@
 
 
-double LinFit(const OMatrix& fx, const OVector& y, OVector& c)
+double LinFit(const Matrix& fx, const Vector& y, Vector& c)
 {
   int n = y.NElts();
@@ -28 +26 @@
   int nf = fx.NRows();
 
-  OMatrix a(nf,nf);
+  Matrix a(nf,nf);
 
   for (int j=0; j<nf; j++)
@@ -36 +34 @@
   c = fx * y;
 
-  if (OMatrix::GausPiv(a,c) == 0) THROW(singMatxErr);
+  if (Matrix::GausPiv(a,c) == 0) THROW(singMatxErr);
 
   double xi2 = 0;
@@ -52 +50 @@
 
 
-double LinFit(const OVector& x, const OVector& y, const OVector& errY2, int nf,
-           double (*f)(int, double), OVector& c, OVector& errC)
+double LinFit(const Vector& x, const Vector& y, const Vector& errY2, int nf,
+           double (*f)(int, double), Vector& c, Vector& errC)
 {
   int n = x.NElts();
   if (n != y.NElts()) THROW(sizeMismatchErr);
   
-  OMatrix fx(nf, n);
+  Matrix fx(nf, n);
   for (int i=0; i<nf; i++)
     for (int j=0; j<n; j++)
@@ -67 +65 @@
 
 
-double LinFit(const OMatrix& fx, const OVector& y, const OVector& errY2,
-           OVector& c, OVector& errC)
+double LinFit(const Matrix& fx, const Vector& y, const Vector& errY2,
+           Vector& c, Vector& errC)
 {
   int n = y.NElts();
@@ -76 +74 @@
   int nf = fx.NRows();
 
-  OMatrix a(nf,nf);
+  Matrix a(nf,nf);
 
   c.Realloc(nf);
@@ -89 +87 @@
     }
  
-  OMatrix d(nf,nf+1);
+  Matrix d(nf,nf+1);
   for (int k=0; k<nf; k++) {
     double x=0;
@@ -99 +97 @@
   }
 
-  if (OMatrix::GausPiv(a,d) == 0) THROW(singMatxErr);
+  if (Matrix::GausPiv(a,d) == 0) THROW(singMatxErr);
 
   for (int l=0; l<nf; l++) {