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

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.h (modified) (7 diffs)

trunk/SophyaLib/NTools/poly.h

@@ -1 +1 @@
 // This may look like C code, but it is really -*- C++ -*-
 //
-// $Id: poly.h,v 1.1.1.1 1999-04-09 17:57:58 ansari Exp $
+// $Id: poly.h,v 1.2 1999-10-25 10:36:11 ansari Exp $
 //
 
@@ -16 +16 @@
 class Poly2;
 
-class Poly : public Vector {
+class Poly : public OVector {
 public:
   Poly(int degre = 0);
@@ -26 +26 @@
   inline int Degre() const {UpdateDegIfDirty(); return deg;}
 
-  inline void Realloc(int n, bool force=false) {Vector::Realloc(n+1,force);}
+  inline void Realloc(int n, bool force=false) {OVector::Realloc(n+1,force);}
 
   inline double operator[](int i) const {return data[i];}
@@ -41 +41 @@
   // Derive le polynome dans un autre
 
-  int    Roots(Vector& roots) const;
+  int    Roots(OVector& roots) const;
   // retourne les racines si on peut les calculer...
 
@@ -72 +72 @@
   friend ostream& operator << (ostream& s, const Poly& a);
 
-  double Fit(Vector const& x, Vector const& y, int degre);
+  double Fit(OVector const& x, OVector const& y, int degre);
   // Fit d'un polynome de degre donne sur les x et y.
 
-  double Fit(Vector const& x, Vector const& y, Vector const& erry2, int degre,
-            Vector& errCoef);
+  double Fit(OVector const& x, OVector const& y, OVector const& erry2, int degre,
+            OVector& errCoef);
   // En plus, on fournit les carres des erreurs sur y et on a les erreurs
   // sur les coefficients dans un vecteur.
@@ -90 +90 @@
 
 
-class Poly2 : public Vector {  // Ca pourrait etre une matrice mais
+class Poly2 : public OVector {  // Ca pourrait etre une matrice mais
                                   // la encore, un vecteur est utile pour les
                                   // fits.
@@ -131 +131 @@
   // retourne le coefficient de degre (dx,dy)
 
-  double Fit(Vector const& x, Vector const& y, Vector const& z,
+  double Fit(OVector const& x, OVector const& y, OVector const& z,
              int degreX, int degreY);
-  double Fit(Vector const& x, Vector const& y, Vector const& z,
-             Vector const& errz2, int degreX, int degreY,
-             Vector& errCoef);
+  double Fit(OVector const& x, OVector const& y, OVector const& z,
+             OVector const& errz2, int degreX, int degreY,
+             OVector& errCoef);
   // degres partiels imposes. cf Poly::Fit sinon
 
 
-  double Fit(Vector const& x, Vector const& y, Vector const& z,
+  double Fit(OVector const& x, OVector const& y, OVector const& z,
              int degre);
-  double Fit(Vector const& x, Vector const& y, Vector const& z,
-             Vector const& errz2, int degre,
-             Vector& errCoef);
+  double Fit(OVector const& x, OVector const& y, OVector const& z,
+             OVector const& errz2, int degre,
+             OVector& errCoef);
   // degre total impose. cf Poly::Fit sinon