joshua/awesome-attractor
Archived
1
Fork 0
Code Activity

fixed a bugje, hardcoded 2 dim (todo: implementing projectors good), ikeda has more parameters

Browse source
This commit is contained in:
Joshua Moerman (joshua-desktop) 2011-06-13 13:09:26 +02:00
parent 936c121289
commit b111948939
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Attractor.hpp
View file

@ -35,6 +35,7 @@ public:
if(kernel->convergent() || kernel->divergent()){ if(kernel->convergent() || kernel->divergent()){
kernel->generate_random_parameters(); kernel->generate_random_parameters();
LogDebug("Generating new parameters.\n"); LogDebug("Generating new parameters.\n");
i = 0;
} }
} }
} }

3
Projector.cpp
View file

@ -4,7 +4,8 @@
#include "projectors/Normalizer.hpp" #include "projectors/Normalizer.hpp"
Projector* Projector::createProjector(stfu::node& projector, unsigned int input_dimension) { Projector* Projector::createProjector(stfu::node& projector, unsigned int input_dimension) {
Projector* output = new Normalizer(input_dimension); //Projector* output = new Normalizer(input_dimension);
Projector* output = new Normalizer(2);
return output; return output;
} }

11
kernels/Ikeda3D.hpp
View file

@ -16,7 +16,7 @@ private:
public: public:
Ikeda3D(): Ikeda3D():
AttractorKernel(3, 1) { AttractorKernel(3, 4) {
init(); init();
} }
@ -24,16 +24,19 @@ public:
virtual void generate_random_parameters() { virtual void generate_random_parameters() {
parameters[0] = rand() / double(RAND_MAX) *2.0 - 0.5; parameters[0] = rand() / double(RAND_MAX) *2.0 - 0.5;
parameters[1] = rand() / double(RAND_MAX) *2.0 - 0.5; // wikipedia: u
parameters[2] = rand() / double(RAND_MAX) *2.0 - 0.5;
parameters[3] = rand() / double(RAND_MAX) *30.0;
init(); init();
} }
virtual void operator()() { virtual void operator()() {
std::swap(vectorNew, vectorOld); std::swap(vectorNew, vectorOld);
vectorOld[2] = 0.4 - 6.0/(1 + vectorOld[0]*vectorOld[0] + vectorOld[1]*vectorNew[1]); vectorOld[2] = parameters[2] - parameters[3]/(1 + vectorOld[0]*vectorOld[0] + vectorOld[1]*vectorNew[1]);
vectorNew[0] = 1 + parameters[0] * (vectorOld[0]*cos(vectorOld[2]) - vectorOld[1]*sin(vectorOld[2])); vectorNew[0] = parameters[0] + parameters[1] * (vectorOld[0]*cos(vectorOld[2]) - vectorOld[1]*sin(vectorOld[2]));
vectorNew[0] = parameters[0] * (vectorOld[0]*sin(vectorOld[2]) + vectorOld[1]*cos(vectorOld[2])); vectorNew[1] = parameters[1] * (vectorOld[0]*sin(vectorOld[2]) + vectorOld[1]*cos(vectorOld[2]));
} }
}; };