X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fpolynomial.hh;h=379609bcaf3d7b3b4b5be06aab2a471177cb8648;hb=cb0b407e567feca71cbc5f9479a06b266c69a26c;hp=9563acf50ca0cd1f426e8875b5a54fb502a71617;hpb=a42aaa559b71ce5776795fa11a7e1df9110d85b7;p=lilypond.git diff --git a/flower/include/polynomial.hh b/flower/include/polynomial.hh index 9563acf50c..379609bcaf 100644 --- a/flower/include/polynomial.hh +++ b/flower/include/polynomial.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1993--2011 Han-Wen Nienhuys + Copyright (C) 1993--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,6 +24,7 @@ #ifndef POLY_H #define POLY_H +#include #include "std-vector.hh" #include "arithmetic-operator.hh" #include "real.hh" @@ -35,7 +36,7 @@ struct Polynomial ssize_t degree ()const; /// coefficients - vector coefs_; + std::vector coefs_; // leading coef Real &lc (); @@ -45,8 +46,8 @@ struct Polynomial void print () const; Real eval (Real) const; Real minmax (Real, Real, bool) const; - void print_sols (vector) const; - void check_sols (vector) const; + void print_sols (std::vector) const; + void check_sols (std::vector) const; void check_sol (Real x) const; static Polynomial multiply (const Polynomial &p1, const Polynomial &p2); static Polynomial power (int exponent, const Polynomial &src); @@ -72,11 +73,11 @@ struct Polynomial void debug_clean (); - vector solve_quadric ()const; - vector solve_cubic ()const; - vector solve_linear ()const; + std::vector solve_quadric ()const; + std::vector solve_cubic ()const; + std::vector solve_linear ()const; - vector solve () const; + std::vector solve () const; }; IMPLEMENT_ARITHMETIC_OPERATOR (Polynomial, -);