Commit 41cc6512 authored by pacanows's avatar pacanows

Merge

parents 020c9f07 e9c6a2c1
TARGET = rational_fitter_eigen
TEMPLATE = lib
CONFIG *= qt \
plugin \
eigen
eigen
DESTDIR = ../../build
......
......@@ -2,7 +2,7 @@ TARGET = rational_fitter_quadproge
TEMPLATE = lib
CONFIG *= qt \
plugin \
eigen
eigen
DESTDIR = ../../build
......
......@@ -43,8 +43,8 @@ vec rational_function::value(const vec& x) const
{
vec res(_nY) ;
const int np = a.size() / _nY ;
const int nq = b.size() / _nY ;
unsigned int const np = a.size() / _nY ;
unsigned int const nq = b.size() / _nY ;
for(int k=0; k<_nY; ++k)
{
......
......@@ -26,7 +26,7 @@ class rational_function : /*public QObject,*/ public function
// Overload the function operator
virtual vec value(const vec& x) const ;
virtual vec operator()(const vec& x) const { return value(x) ; } ;
virtual vec operator()(const vec& x) const { return value(x) ; }
// Get the p_i and q_j function
virtual double p(const vec& x, int i) const ;
......@@ -41,8 +41,8 @@ class rational_function : /*public QObject,*/ public function
const std::vector<double>& in_b) ;
// Get the coefficients
virtual double getP(int i) const { return a[i] ; } ;
virtual double getQ(int i) const { return b[i] ; } ;
virtual double getP(int i) const { return a[i] ; }
virtual double getQ(int i) const { return b[i] ; }
// STL stream ouput
friend std::ostream& operator<< (std::ostream& out, const rational_function& r) ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment