Browse Source

done stuff

master
Joshua 14 years ago
parent
commit
b48f2e9dd1
  1. 8
      kernels/BasicKernel.cpp
  2. 8
      kernels/BasicKernel.h
  3. 2
      kernels/Logistic.cpp
  4. 8
      kernels/Logistic.hpp
  5. 2
      kernels/Lorenz3D.cpp
  6. 8
      kernels/Lorenz3D.hpp
  7. 2
      kernels/Polynomial.cpp
  8. 8
      kernels/Polynomial.hpp
  9. 2
      kernels/PolynomialA3D.cpp
  10. 8
      kernels/PolynomialA3D.hpp
  11. 2
      kernels/Unravel3D.cpp
  12. 8
      kernels/Unravel3D.hpp

8
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;
}

8
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();
};

2
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;
}

8
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();
};

2
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;
}

8
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();
};

2
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;
}

8
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();
};

2
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;
}

8
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();
};

2
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;
}

8
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();
};