compilable

Attractor.cpp

@@ -16,8 +16,6 @@ using namespace std;
 Attractor::Attractor():
         dim(3), par(4), formula(LORENZ), param(NULL), point(NULL), new_point(NULL) {
     // Default attractor: 3D Lorenz attrractor
-    init_vector();
-    init_param();
 
     param[0] = 0.001;       //dt
     param[1] = 10;          //sigma

kernels/Logistic.cpp

@@ -51,8 +51,8 @@ void Logistic::init() {
 void Logistic::iterate() {
     swap(vectorNew, vectorOld);
 
-        for ( unsigned int i = 0; i < dim; i++ ) {
-        new_point[i] = param[i]*point[i]*(1.0 - point[i]);
+    for ( unsigned int i = 0; i < dimension; i++ ) {
+        vectorNew[i] = myParameters[i]*vectorOld[i]*(1.0 - vectorOld[i]);
     }
 }
 

kernels/Logistic.hpp

@@ -1,6 +1,8 @@
 #ifndef LOGISTIC_HPP
 #define LOGISTIC_HPP
 
+#include <cassert>
+
 #include "../AttractorKernel.hpp"
 
 class Logistic : AttractorKernel {

kernels/Polynomial.cpp

@@ -50,7 +50,7 @@ void Polynomial::init(){
 
 void Polynomial::calculateNumberOfParameters(){
     double n_coef = orde + 1;
-    for (unsigned int i = 2; i <= dim; i++) {
+    for (unsigned int i = 2; i <= dimension; i++) {
         n_coef = n_coef*(orde + i)/(i - 1);
     }
 
@@ -61,7 +61,7 @@ void Polynomial::iterate() {
     swap(vectorNew, vectorOld);
 
     unsigned int m = 0;
-    for ( unsigned int i = 0; i < dim; i++ ) {
+    for ( unsigned int i = 0; i < dimension; i++ ) {
 
 #ifdef HARDDEBUG
         cout << "Entering new dimension: " << i << " With m = " << m << endl;
@@ -76,7 +76,7 @@ void Polynomial::iterate() {
 
 void Polynomial::recur(unsigned int curr_dimension, unsigned int prev_i, unsigned int n, unsigned int& m, double prev_product) {
     double product;
-    for (unsigned int i = prev_i; i < dim; i++) {
+    for (unsigned int i = prev_i; i < dimension; i++) {
 
 #ifdef HARDDEBUG
         for ( unsigned int j = 0; j < n; j++ )

kernels/Polynomial.hpp

@@ -1,6 +1,8 @@
 #ifndef POLYNOMIAL_HPP
 #define POLYNOMIAL_HPP
 
+#include <cassert>
+
 #include "../AttractorKernel.hpp"
 
 class Polynomial : public AttractorKernel {
@@ -16,7 +18,7 @@ class Polynomial : public AttractorKernel {
 
     void init();
     void calculateNumberOfParameters();
-    void recur(unsigned int curr_dimension, unsigned int prev_i, unsigned int n, unsigned int& m, double prev_product);
+    void recur(unsigned int curr_dimension, unsigned int prev_i, unsigned int n, unsigned int& m, double prev_product=1.0);
 
     public:
 

kernels/PolynomialA3D.cpp

@@ -6,6 +6,8 @@
 //  Copyright 2010 Joshua Moerman. All rights reserved.
 //
 
+#include "PolynomialA3D.hpp"
+
 const static unsigned int dimension = 3;
 const static unsigned int numberOfParameters = 3;
 

kernels/PolynomialA3D.hpp

@@ -1,6 +1,8 @@
 #ifndef POLYNOMIALA3D_HPP
 #define POLYNOMIALA3D_HPP
 
+#include <cassert>
+
 #include "../AttractorKernel.hpp"
 
 class PolynomialA3D : public AttractorKernel {