Changeset 938 in Sophya for trunk/SophyaLib/NTools/poly.cc

Timestamp:

Apr 14, 2000, 6:14:31 PM (25 years ago)

Author:

ansari

Message:

Vector,Matrix -> TVector,TMatrix<r_8> cmv 14/4/00

File:

• trunk/SophyaLib/NTools/poly.cc (modified) (30 diffs)

trunk/SophyaLib/NTools/poly.cc

@@ -31 +31 @@
 
 Poly::Poly(int degre)
-: Vector(degre+1), dirty(0), deg(0)
+: TVector<r_8>(degre+1), dirty(0), deg(0)
 {
   END_CONSTRUCTOR
@@ -41 +41 @@
 //      Constructeur par copie.
 //--
-:Vector(a), dirty(a.dirty), deg(a.deg)
+:TVector<r_8>(a), dirty(a.dirty), deg(a.deg)
 {
   END_CONSTRUCTOR
@@ -111 +111 @@
 
 //++
-int Poly::Roots(Vector& roots) const
+int Poly::Roots(TVector<r_8>& roots) const
 //
 //      Retourne dans roots les racines réelles, si on sait
@@ -179 +179 @@
 {
   if (this == &a) return *this;
-  Vector::operator=(a);
+  TVector<r_8>::operator=(a);
 
   UpdateDeg();
@@ -275 +275 @@
 
 //++
-double Poly::Fit(Vector const& x, Vector const& y, int degre)
+double Poly::Fit(TVector<r_8> const& x, TVector<r_8> const& y, int degre)
 //
 //      Ajustement polynomial par moindre carrés. Un polynôme de
@@ -287 +287 @@
   Realloc(degre);
 
-  Matrix a(degre+1, n);
+  TMatrix<r_8> a(degre+1, n);
 
   for (int c=0; c<n; c++) {
@@ -297 +297 @@
   }
 
-  LinFitter lf;
-  double rc = lf.LinFit(a,y,(Vector&)*this);
+  LinFitter<r_8> lf;
+  double rc = lf.LinFit(a,y,(TVector<r_8>&)*this);
   UpdateDeg();
   return rc;
@@ -304 +304 @@
 
 //++
-double Poly::Fit(Vector const& x, Vector const& y, Vector const& erry2, int degre,
-                 Vector& errCoef)
+double Poly::Fit(TVector<r_8> const& x, TVector<r_8> const& y,
+       TVector<r_8> const& erry2, int degre,TVector<r_8>& errCoef)
 //
 //      Ajustement polynomial par moindre carrés. Un polynôme de
@@ -320 +320 @@
   errCoef.Realloc(degre+1);
 
-  Matrix a(degre+1, n);
+  TMatrix<r_8> a(degre+1, n);
 
   for (int c=0; c<n; c++) {
@@ -330 +330 @@
   }
 
-  LinFitter lf;
-  double rc = lf.LinFit(a,y,erry2,(Vector&)*this,errCoef);
+  LinFitter<r_8> lf;
+  double rc = lf.LinFit(a,y,erry2,(TVector<r_8>&)*this,errCoef);
   UpdateDeg();
   return rc;
@@ -371 +371 @@
 is >> dg;
 dobj->Realloc(dg,true);
-is >> *((Vector *) dobj);
+is >> *((TVector<r_8> *) dobj);
 dobj->UpdateDeg();
 }
@@ -381 +381 @@
 dobj->Realloc(dobj->deg,true);
 os << dobj->deg;
-os << *((Vector *) dobj);
+os << *((TVector<r_8> *) dobj);
 }
 
@@ -417 +417 @@
 //      Crée un polynôme de degrés partiels degreX et degreY.
 //--
-:Vector((degreX+1)*(degreY+1)), dirty(0),
+:TVector<r_8>((degreX+1)*(degreY+1)), dirty(0),
  maxDegX(degreX), maxDegY(degreY), degX(0), degY(0), deg(0)
 {
@@ -429 +429 @@
 //      de deux polynômes à une variable, p2(x,y)=px(x)py(y)
 //--
-:Vector((polX.Degre()+1)*(polY.Degre()+1)), dirty(0),
+:TVector<r_8>((polX.Degre()+1)*(polY.Degre()+1)), dirty(0),
  maxDegX(polX.Degre()), maxDegY(polY.Degre()),
  degX(polX.Degre()), degY(polY.Degre()), deg(degX+degY)
@@ -444 +444 @@
 //      Constructeur par copie.
 //--
-:Vector(a), dirty(a.dirty),
+:TVector<r_8>(a), dirty(a.dirty),
  maxDegX(a.maxDegX), maxDegY(a.maxDegY),
  degX(a.degX), degY(a.degY), deg(a.deg)
@@ -484 +484 @@
   UpdateDegIfDirty();
   Poly2 tmp(*this);
-  Vector::Realloc((degreX+1)*(degreY+1));
+  TVector<r_8>::Realloc((degreX+1)*(degreY+1));
   DataBlock().Reset();
   maxDegX = degreX;
@@ -554 +554 @@
 
 //++
-double Poly2::Fit(Vector const& x, Vector const& y, Vector const& z,
-                  int degreX, int degreY)
+double Poly2::Fit(TVector<r_8> const& x, TVector<r_8> const& y,
+                 TVector<r_8> const& z, int degreX, int degreY)
 //
 //      Ajustement par moindre carrés z = P(x,y), degrés partiels imposés.
@@ -566 +566 @@
   Realloc(degreX, degreY);
 
-  Matrix a((degreX+1)*(degreY+1), n);
+  TMatrix<r_8> a((degreX+1)*(degreY+1), n);
 
   for (int c=0; c<n; c++) {
@@ -580 +580 @@
   }
 
-  LinFitter lf;
-  double rc = lf.LinFit(a,z,(Vector&)*this);
+  LinFitter<r_8> lf;
+  double rc = lf.LinFit(a,z,(TVector<r_8>&)*this);
   UpdateDeg();
   return rc;
@@ -588 +588 @@
 
 //++
-double Poly2::Fit(Vector const& x, Vector const& y, Vector const& z,
-                  Vector const& errz2, int degreX, int degreY,
-                  Vector& errCoef)
+double Poly2::Fit(TVector<r_8> const& x, TVector<r_8> const& y, TVector<r_8> const& z,
+                  TVector<r_8> const& errz2, int degreX, int degreY,
+                  TVector<r_8>& errCoef)
 //
 //      Ajustement par moindre carrés z = P(x,y), degrés partiels imposés,
@@ -604 +604 @@
   errCoef.Realloc((degreX+1)*(degreY+1));
 
-  Matrix a((degreX+1)*(degreY+1), n);
+  TMatrix<r_8> a((degreX+1)*(degreY+1), n);
 
   for (int c=0; c<n; c++) {
@@ -618 +618 @@
   }
 
-  LinFitter lf;
-  double rc = lf.LinFit(a,z,errz2,(Vector&)*this,errCoef);
+  LinFitter<r_8> lf;
+  double rc = lf.LinFit(a,z,errz2,(TVector<r_8>&)*this,errCoef);
   UpdateDeg();
   return rc;
@@ -625 +625 @@
 
 //++
-double Poly2::Fit(Vector const& x, Vector const& y, Vector const& z,
-                  int degre)
+double Poly2::Fit(TVector<r_8> const& x, TVector<r_8> const& y,
+                              TVector<r_8> const& z, int degre)
 //
 //      Ajustement par moindre carrés z = P(x,y), degré total imposé.
@@ -637 +637 @@
   Realloc(degre, degre);   // certains vaudront 0, impose.
 
-  Matrix a((degre+1)*(degre+2)/2, n);
-  Vector cf((degre+1)*(degre+2)/2);
+  TMatrix<r_8> a((degre+1)*(degre+2)/2, n);
+  TVector<r_8> cf((degre+1)*(degre+2)/2);
 #define C_INDEX(i,j) ((i) + (j)*(2*degre+3-(j))/2)
 
@@ -654 +654 @@
   }
 
-  LinFitter lf;
+  LinFitter<r_8> lf;
   double rc = lf.LinFit(a,z,cf);
 
@@ -670 +670 @@
 
 //++
-double Poly2::Fit(Vector const& x, Vector const& y, Vector const& z,
-                  Vector const& errz2, int degre,
-                  Vector& errCoef)
+double Poly2::Fit(TVector<r_8> const& x, TVector<r_8> const& y,
+               TVector<r_8> const& z,TVector<r_8> const& errz2,
+                              int degre, TVector<r_8>& errCoef)
 //
 //      Ajustement par moindre carrés z = P(x,y), degré total imposé,
@@ -687 +687 @@
 #define C_INDEX(i,j) ((i) + (j)*(2*degre+3-(j))/2)
 
-  Matrix a((degre+1)*(degre+2)/2, n);
-  Vector cf((degre+1)*(degre+2)/2);
-  Vector ecf((degre+1)*(degre+2)/2);
+  TMatrix<r_8> a((degre+1)*(degre+2)/2, n);
+  TVector<r_8> cf((degre+1)*(degre+2)/2);
+  TVector<r_8> ecf((degre+1)*(degre+2)/2);
 
   for (int c=0; c<n; c++) {
@@ -704 +704 @@
   }
 
-  LinFitter lf;
+  LinFitter<r_8> lf;
   double rc = lf.LinFit(a,z,errz2,cf,ecf);
 
@@ -875 +875 @@
 is >> dgx >> dgy;
 dobj->Realloc(dgx,dgy);
-is >> *((Vector *) dobj);
+is >> *((TVector<r_8> *) dobj);
 dobj->UpdateDeg();
 }
@@ -883 +883 @@
 if(dobj == NULL) return;
 os << dobj->maxDegX << dobj->maxDegY;
-os << *((Vector *) dobj);
+os << *((TVector<r_8> *) dobj);
 }