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

Timestamp:

Oct 25, 1999, 12:36:22 PM (26 years ago)

Author:

ansari

Message:

Vector/Matrix OVector/OMatrix cmv 25/10/99

File:

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

trunk/SophyaLib/NTools/poly.cc

@@ -13 +13 @@
 //++
 // Links        Parents
-// Vector
+// OVector
 //--
 
@@ -29 +29 @@
 
 Poly::Poly(int degre)
-: Vector(degre+1), dirty(0), deg(0)
+: OVector(degre+1), dirty(0), deg(0)
 {
   END_CONSTRUCTOR
@@ -99 +99 @@
 
 //++
-int Poly::Roots(Vector& roots) const
+int Poly::Roots(OVector& roots) const
 //
 //      Retourne dans roots les racines réelles, si on sait
@@ -167 +167 @@
 {
   if (this == &a) return *this;
-  Vector::operator=(a);
+  OVector::operator=(a);
 
   UpdateDeg();
@@ -324 +324 @@
 #endif
 
-  Vector::ReadSelf(s);
+  OVector::ReadSelf(s);
 
 #ifdef DEBUG
@@ -341 +341 @@
   ((Poly*)(this))->Realloc(deg, true);
   s << deg;
-  Vector::WriteSelf(s);
+  OVector::WriteSelf(s);
 }
 
@@ -375 +375 @@
 
 //++
-double Poly::Fit(Vector const& x, Vector const& y, int degre)
+double Poly::Fit(OVector const& x, OVector const& y, int degre)
 //
 //      Ajustement polynomial par moindre carrés. Un polynôme de
@@ -387 +387 @@
   Realloc(degre);
 
-  Matrix a(degre+1, n);
+  OMatrix a(degre+1, n);
 
   for (int c=0; c<n; c++) {
@@ -397 +397 @@
   }
 
-  double rc = LinFit(a,y,(Vector&)*this);
+  double rc = LinFit(a,y,(OVector&)*this);
   UpdateDeg();
   return rc;
@@ -403 +403 @@
 
 //++
-double Poly::Fit(Vector const& x, Vector const& y, Vector const& erry2, int degre,
-                 Vector& errCoef)
+double Poly::Fit(OVector const& x, OVector const& y, OVector const& erry2, int degre,
+                 OVector& errCoef)
 //
 //      Ajustement polynomial par moindre carrés. Un polynôme de
@@ -419 +419 @@
   errCoef.Realloc(degre+1);
 
-  Matrix a(degre+1, n);
+  OMatrix a(degre+1, n);
 
   for (int c=0; c<n; c++) {
@@ -429 +429 @@
   }
 
-  double rc = LinFit(a,y,erry2,(Vector&)*this,errCoef);
+  double rc = LinFit(a,y,erry2,(OVector&)*this,errCoef);
   UpdateDeg();
   return rc;
@@ -482 +482 @@
 //++
 // Links        Parents
-// Vector
+// OVector
 //--
 
@@ -494 +494 @@
 //      Crée un polynôme de degrés partiels degreX et degreY.
 //--
-:Vector((degreX+1)*(degreY+1)), dirty(0),
+:OVector((degreX+1)*(degreY+1)), dirty(0),
  maxDegX(degreX), maxDegY(degreY), degX(0), degY(0), deg(0)
 {
@@ -506 +506 @@
 //      de deux polynômes à une variable, p2(x,y)=px(x)py(y)
 //--
-:Vector((polX.Degre()+1)*(polY.Degre()+1)), dirty(0),
+:OVector((polX.Degre()+1)*(polY.Degre()+1)), dirty(0),
  maxDegX(polX.Degre()), maxDegY(polY.Degre()),
  degX(polX.Degre()), degY(polY.Degre()), deg(degX+degY)
@@ -521 +521 @@
 //      Constructeur par copie.
 //--
-:Vector(a), dirty(a.dirty),
+:OVector(a), dirty(a.dirty),
  maxDegX(a.maxDegX), maxDegY(a.maxDegY),
  degX(a.degX), degY(a.degY), deg(a.deg)
@@ -561 +561 @@
   UpdateDegIfDirty();
   Poly2 tmp(*this);
-  Vector::Realloc((degreX+1)*(degreY+1));
+  OVector::Realloc((degreX+1)*(degreY+1));
   Zero();
   maxDegX = degreX;
@@ -631 +631 @@
 
 //++
-double Poly2::Fit(Vector const& x, Vector const& y, Vector const& z,
+double Poly2::Fit(OVector const& x, OVector const& y, OVector const& z,
                   int degreX, int degreY)
 //
@@ -643 +643 @@
   Realloc(degreX, degreY);
 
-  Matrix a((degreX+1)*(degreY+1), n);
+  OMatrix a((degreX+1)*(degreY+1), n);
 
   for (int c=0; c<n; c++) {
@@ -657 +657 @@
   }
 
-  double rc = LinFit(a,z,(Vector&)*this);
+  double rc = LinFit(a,z,(OVector&)*this);
   UpdateDeg();
   return rc;
@@ -664 +664 @@
 
 //++
-double Poly2::Fit(Vector const& x, Vector const& y, Vector const& z,
-                  Vector const& errz2, int degreX, int degreY,
-                  Vector& errCoef)
+double Poly2::Fit(OVector const& x, OVector const& y, OVector const& z,
+                  OVector const& errz2, int degreX, int degreY,
+                  OVector& errCoef)
 //
 //      Ajustement par moindre carrés z = P(x,y), degrés partiels imposés,
@@ -680 +680 @@
   errCoef.Realloc((degreX+1)*(degreY+1));
 
-  Matrix a((degreX+1)*(degreY+1), n);
+  OMatrix a((degreX+1)*(degreY+1), n);
 
   for (int c=0; c<n; c++) {
@@ -694 +694 @@
   }
 
-  double rc = LinFit(a,z,errz2,(Vector&)*this,errCoef);
+  double rc = LinFit(a,z,errz2,(OVector&)*this,errCoef);
   UpdateDeg();
   return rc;
@@ -700 +700 @@
 
 //++
-double Poly2::Fit(Vector const& x, Vector const& y, Vector const& z,
+double Poly2::Fit(OVector const& x, OVector const& y, OVector const& z,
                   int degre)
 //
@@ -712 +712 @@
   Realloc(degre, degre);   // certains vaudront 0, impose.
 
-  Matrix a((degre+1)*(degre+2)/2, n);
-  Vector cf((degre+1)*(degre+2)/2);
+  OMatrix a((degre+1)*(degre+2)/2, n);
+  OVector cf((degre+1)*(degre+2)/2);
 #define C_INDEX(i,j) ((i) + (j)*(2*degre+3-(j))/2)
 
@@ -744 +744 @@
 
 //++
-double Poly2::Fit(Vector const& x, Vector const& y, Vector const& z,
-                  Vector const& errz2, int degre,
-                  Vector& errCoef)
+double Poly2::Fit(OVector const& x, OVector const& y, OVector const& z,
+                  OVector const& errz2, int degre,
+                  OVector& errCoef)
 //
 //      Ajustement par moindre carrés z = P(x,y), degré total imposé,
@@ -761 +761 @@
 #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);
+  OMatrix a((degre+1)*(degre+2)/2, n);
+  OVector cf((degre+1)*(degre+2)/2);
+  OVector ecf((degre+1)*(degre+2)/2);
 
   for (int c=0; c<n; c++) {
@@ -806 +806 @@
 #endif
 
-  Vector::ReadSelf(s);
+  OVector::ReadSelf(s);
 
 #ifdef DEBUG
@@ -817 +817 @@
 {
   s << maxDegX << maxDegY;
-  Vector::WriteSelf(s);
+  OVector::WriteSelf(s);
 }