X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fpolynomial.hh;h=faf52d20266d1b0bebde49266886a8ad4f3122d1;hb=af770f3440264c18ce01525dce1aa76b86ace0d5;hp=62a88223ec449975860263f9cd096b3e40857d3a;hpb=2745cbd907f8216a4cc1fc5f488ae19efdfdbd10;p=lilypond.git

diff --git a/flower/include/polynomial.hh b/flower/include/polynomial.hh
index 62a88223ec..faf52d2026 100644
--- 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--2003 Han-Wen Nienhuys
+ * (c) 1993--2006 Han-Wen Nienhuys
  */
 
 #ifndef POLY_H
 #define POLY_H
 
-#include "array.hh"
+#include "std-vector.hh"
 #include "arithmetic-operator.hh"
 #include "real.hh"
 
@@ -19,20 +19,20 @@ struct Polynomial
   int degree ()const;
 
   /// coefficients 
-  Array<Real>     coefs_;
+  vector<Real> coefs_;
 
   // leading coef
   Real &lc ();
 
   // leading coef
   Real lc () const;
-  void print () const ;	
-  Real eval (Real) const ;
-  void print_sols (Array<Real>) const ;
-  void check_sols (Array<Real>) const ;
+  void print () const;
+  Real eval (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);
+  static Polynomial multiply (const Polynomial &p1, const Polynomial &p2);
+  static Polynomial power (int exponent, const Polynomial &src);
 
   /// chop low coefficients
   void clean ();
@@ -41,42 +41,41 @@ struct Polynomial
   void real_clean ();
   void scalarmultiply (Real fact);
   void operator *= (Real f) { scalarmultiply (f); }
-  void operator /= (Real f) { scalarmultiply (1/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 (Real a, Real b = 0.0);
   Polynomial (){}
-  void set_negate (const Polynomial & src);
-    
+  void set_negate (const Polynomial &src);
+
   /// take the derivative
   void differentiate ();
   int set_mod (const Polynomial &u, const Polynomial &v);
 
   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, - );
-IMPLEMENT_ARITHMETIC_OPERATOR (Polynomial, + );
-IMPLEMENT_ARITHMETIC_OPERATOR (Polynomial, * );
+IMPLEMENT_ARITHMETIC_OPERATOR (Polynomial, -);
+IMPLEMENT_ARITHMETIC_OPERATOR (Polynomial, +);
+IMPLEMENT_ARITHMETIC_OPERATOR (Polynomial, *);
 
 inline Polynomial
 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