Run `make grand-replace'.

[lilypond.git] / flower / include / polynomial.hh

diff --git a/flower/include/polynomial.hh b/flower/include/polynomial.hh
index ec61d47103eae2c9b05e8ce9677c5c7ee3d52b1b..144ba3d1d1dadd0c8b0671b2d9580b7f13e55d8a 100644 (file)
--- a/flower/include/polynomial.hh
+++ b/flower/include/polynomial.hh
@@ -2,13 +2,13 @@
 /*
  * poly.h -- routines for manipulation of polynomials in one var
  *
- * (c) 1993--2005 Han-Wen Nienhuys
+ * (c) 1993--2008 Han-Wen Nienhuys
  */
 
 #ifndef POLY_H
 #define POLY_H
 
-#include "array.hh"
+#include "std-vector.hh"
 #include "arithmetic-operator.hh"
 #include "real.hh"
 
@@ -19,7 +19,7 @@ struct Polynomial
   int degree ()const;
 
   /// coefficients 
-  Array<Real> coefs_;
+  vector<Real> coefs_;
 
   // leading coef
   Real &lc ();
@@ -28,8 +28,8 @@ struct Polynomial
   Real lc () const;
   void print () const;
   Real eval (Real) const;
-  void print_sols (Array<Real>) const;
-  void check_sols (Array<Real>) const;
+  void print_sols (vector<Real>) const;
+  void check_sols (vector<Real>) const;
   void check_sol (Real x) const;
   static Polynomial multiply (const Polynomial &p1, const Polynomial &p2);
   static Polynomial power (int exponent, const Polynomial &src);
@@ -40,12 +40,12 @@ struct Polynomial
   /// eliminate #x#  close to  zero
   void real_clean ();
   void scalarmultiply (Real fact);
-  void operator*= (Real f) { scalarmultiply (f); }
-  void operator/= (Real f) { scalarmultiply (1 / f); }
-  void operator+= (Polynomial const &p2);
-  void operator*= (Polynomial const &p2);
-  void operator-= (Polynomial const &p2);
-  Polynomial (Real a, Real b =0.0);
+  void operator *= (Real f) { scalarmultiply (f); }
+  void operator /= (Real f) { scalarmultiply (1 / f); }
+  void operator += (Polynomial const &p2);
+  void operator *= (Polynomial const &p2);
+  void operator -= (Polynomial const &p2);
+  Polynomial (Real a, Real b = 0.0);
   Polynomial (){}
   void set_negate (const Polynomial &src);
 
@@ -55,11 +55,11 @@ struct Polynomial
 
   void debug_clean ();
 
-  Array<Real> solve_quadric ()const;
-  Array<Real> solve_cubic ()const;
-  Array<Real> solve_linear ()const;
+  vector<Real> solve_quadric ()const;
+  vector<Real> solve_cubic ()const;
+  vector<Real> solve_linear ()const;
 
-  Array<Real> solve () const;
+  vector<Real> solve () const;
 };
 
 IMPLEMENT_ARITHMETIC_OPERATOR (Polynomial, -);
@@ -67,15 +67,15 @@ IMPLEMENT_ARITHMETIC_OPERATOR (Polynomial, +);
 IMPLEMENT_ARITHMETIC_OPERATOR (Polynomial, *);
 
 inline Polynomial
-operator* (Polynomial p, Real a)
+operator * (Polynomial p, Real a)
 {
-  p *=a;
+  p *= a;
   return p;
 }
 inline Polynomial
-operator* (Real a, Polynomial p)
+operator * (Real a, Polynomial p)
 {
-  p *=a;
+  p *= a;
   return p;
 }
 #endif