X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fpolynomial.hh;h=f80b53c2eec1d62355bbb984bf617ed3859d3e0f;hb=fd851a83b6f3faa1c031baa6aae46ea92666c3c1;hp=c3bbc17d6c24cfd8b48707f4e871c6bea9111d2a;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git

diff --git a/flower/include/polynomial.hh b/flower/include/polynomial.hh
index c3bbc17d6c..f80b53c2ee 100644
--- a/flower/include/polynomial.hh
+++ b/flower/include/polynomial.hh
@@ -1,25 +1,42 @@
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1993--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 /*
- * poly.h -- routines for manipulation of polynomials in one var
- *
- * (c) 1993--2006 Han-Wen Nienhuys
+ * polynomial.hh -- routines for manipulation of polynomials in one var
  */
 
 #ifndef POLY_H
 #define POLY_H
 
+#include <sys/types.h>
 #include "std-vector.hh"
 #include "arithmetic-operator.hh"
 #include "real.hh"
 
-/// structure for a polynomial in one var. 
+/// structure for a polynomial in one var.
 struct Polynomial
 {
   /// degree of polynomial
-  int degree ()const;
+  ssize_t degree ()const;
 
-  /// coefficients 
-  std::vector<Real> coefs_;
+  /// coefficients
+  vector<Real> coefs_;
 
   // leading coef
   Real &lc ();
@@ -28,8 +45,9 @@ struct Polynomial
   Real lc () const;
   void print () const;
   Real eval (Real) const;
-  void print_sols (std::vector<Real>) const;
-  void check_sols (std::vector<Real>) const;
+  Real minmax (Real, Real, bool) 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);
@@ -46,7 +64,7 @@ struct Polynomial
   void operator *= (Polynomial const &p2);
   void operator -= (Polynomial const &p2);
   Polynomial (Real a, Real b = 0.0);
-  Polynomial (){}
+  Polynomial () {}
   void set_negate (const Polynomial &src);
 
   /// take the derivative
@@ -55,11 +73,11 @@ struct Polynomial
 
   void debug_clean ();
 
-  std::vector<Real> solve_quadric ()const;
-  std::vector<Real> solve_cubic ()const;
-  std::vector<Real> solve_linear ()const;
+  vector<Real> solve_quadric ()const;
+  vector<Real> solve_cubic ()const;
+  vector<Real> solve_linear ()const;
 
-  std::vector<Real> solve () const;
+  vector<Real> solve () const;
 };
 
 IMPLEMENT_ARITHMETIC_OPERATOR (Polynomial, -);