diff --git a/kernels/BasicKernel.cpp b/kernels/BasicKernel.cpp index 064fa97..515515a 100644 --- a/kernels/BasicKernel.cpp +++ b/kernels/BasicKernel.cpp @@ -4,19 +4,19 @@ BasicKernel::BasicKernel(): myParameters(NULL), vectorNew(NULL), vectorOld(NULL) { } -double * & BasicKernel::parameters() { +inline double * & BasicKernel::parameters() { return myParameters; } -double & BasicKernel::parameter(const unsigned int index) { +inline double & BasicKernel::parameter(const unsigned int index) { return myParameters[index]; } -double * & BasicKernel::vector() { +inline double * & BasicKernel::vector() { return vectorNew; } -double * & BasicKernel::previousVector() { +inline double * & BasicKernel::previousVector() { return vectorOld; } diff --git a/kernels/BasicKernel.h b/kernels/BasicKernel.h index ef05f35..e6f5965 100644 --- a/kernels/BasicKernel.h +++ b/kernels/BasicKernel.h @@ -24,12 +24,12 @@ public: // parameters are stored in a array of doubles // if you want to use other types, use the properties - virtual double& parameter(const unsigned int index); - virtual double*& parameters(); + double& parameter(const unsigned int index); + double*& parameters(); // getter functions for teh resulta - virtual double * & vector(); - virtual double * & previousVector(); + double * & vector(); + double * & previousVector(); }; diff --git a/kernels/Logistic.cpp b/kernels/Logistic.cpp index 8eb2098..961229c 100644 --- a/kernels/Logistic.cpp +++ b/kernels/Logistic.cpp @@ -76,7 +76,7 @@ void Logistic::setProperty(const string identifier, const void * _value) { } } -unsigned int Logistic::getNumberOfParameters() { +inline unsigned int Logistic::getNumberOfParameters() { return dimension; } diff --git a/kernels/Logistic.hpp b/kernels/Logistic.hpp index c42a62c..215c195 100644 --- a/kernels/Logistic.hpp +++ b/kernels/Logistic.hpp @@ -18,11 +18,11 @@ public: Logistic(const unsigned int dimension); - virtual void iterate(); + void iterate(); - virtual void * getProperty(const string identifier); - virtual void setProperty(const string identifier, const void * value); - virtual unsigned int getNumberOfParameters(); + void * getProperty(const string identifier); + void setProperty(const string identifier, const void * value); + unsigned int getNumberOfParameters(); }; diff --git a/kernels/Lorenz3D.cpp b/kernels/Lorenz3D.cpp index a1319eb..5d135a1 100644 --- a/kernels/Lorenz3D.cpp +++ b/kernels/Lorenz3D.cpp @@ -57,7 +57,7 @@ void Lorenz3D::setProperty(const string identifier, const void * value) { return; } -unsigned int Lorenz3D::getNumberOfParameters() { +inline unsigned int Lorenz3D::getNumberOfParameters() { return numberOfParameters; } diff --git a/kernels/Lorenz3D.hpp b/kernels/Lorenz3D.hpp index 570c8f3..4fc0b2d 100644 --- a/kernels/Lorenz3D.hpp +++ b/kernels/Lorenz3D.hpp @@ -20,11 +20,11 @@ public: Lorenz3D(const unsigned int dimensions); - virtual void iterate(); + void iterate(); - virtual void * getProperty(const string identifier); - virtual void setProperty(const string identifier, const void * value); - virtual unsigned int getNumberOfParameters(); + void * getProperty(const string identifier); + void setProperty(const string identifier, const void * value); + unsigned int getNumberOfParameters(); }; diff --git a/kernels/Polynomial.cpp b/kernels/Polynomial.cpp index b10d34b..11df98e 100644 --- a/kernels/Polynomial.cpp +++ b/kernels/Polynomial.cpp @@ -124,6 +124,6 @@ void Polynomial::setProperty(const string identifier, const void * _value) { } } -unsigned int Polynomial::getNumberOfParameters() { +inline unsigned int Polynomial::getNumberOfParameters() { return numberOfParameters; } diff --git a/kernels/Polynomial.hpp b/kernels/Polynomial.hpp index e65b9a9..8074c96 100644 --- a/kernels/Polynomial.hpp +++ b/kernels/Polynomial.hpp @@ -23,11 +23,11 @@ public: Polynomial(const unsigned int dimensions, const unsigned int orde); - virtual void iterate(); + void iterate(); - virtual void * getProperty(const string identifier); - virtual void setProperty(const string identifier, const void * value); - virtual unsigned int getNumberOfParameters(); + void * getProperty(const string identifier); + void setProperty(const string identifier, const void * value); + unsigned int getNumberOfParameters(); }; diff --git a/kernels/PolynomialA3D.cpp b/kernels/PolynomialA3D.cpp index fb5afbd..e4dd0f0 100644 --- a/kernels/PolynomialA3D.cpp +++ b/kernels/PolynomialA3D.cpp @@ -60,6 +60,6 @@ void PolynomialA3D::setProperty(const string identifier, const void * _value) { } -unsigned int PolynomialA3D::getNumberOfParameters() { +inline unsigned int PolynomialA3D::getNumberOfParameters() { return numberOfParameters; } diff --git a/kernels/PolynomialA3D.hpp b/kernels/PolynomialA3D.hpp index 7288f90..06ead4e 100644 --- a/kernels/PolynomialA3D.hpp +++ b/kernels/PolynomialA3D.hpp @@ -16,11 +16,11 @@ public: PolynomialA3D(); - virtual void iterate(); + void iterate(); - virtual void * getProperty(const string identifier); - virtual void setProperty(const string identifier, const void * value); - virtual unsigned int getNumberOfParameters(); + void * getProperty(const string identifier); + void setProperty(const string identifier, const void * value); + unsigned int getNumberOfParameters(); }; diff --git a/kernels/Unravel3D.cpp b/kernels/Unravel3D.cpp index d19b160..34dd827 100644 --- a/kernels/Unravel3D.cpp +++ b/kernels/Unravel3D.cpp @@ -57,6 +57,6 @@ void Unravel3D::setProperty(const string identifier, const void * value) { return; } -unsigned int Unravel3D::getNumberOfParameters() { +inline unsigned int Unravel3D::getNumberOfParameters() { return numberOfParameters; } diff --git a/kernels/Unravel3D.hpp b/kernels/Unravel3D.hpp index d37b6eb..916e11d 100644 --- a/kernels/Unravel3D.hpp +++ b/kernels/Unravel3D.hpp @@ -21,11 +21,11 @@ public: Unravel3D(const unsigned int dimensions); - virtual void iterate(); + void iterate(); - virtual void * getProperty(const string identifier); - virtual void setProperty(const string identifier, const void * value); - virtual unsigned int getNumberOfParameters(); + void * getProperty(const string identifier); + void setProperty(const string identifier, const void * value); + unsigned int getNumberOfParameters(); };