nojhan/eodev
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Oh, right found some errors

Browse source
This commit is contained in:
mac 2000-06-12 20:23:20 +00:00
commit e55e3813dc
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
eo/src/es/eoEsChromInit.h
View file

@ -64,7 +64,8 @@ public :
EOT operator()() EOT operator()()
{ {
return create(EOT()); EOT eo;
return create(eo);
} }
private : private :

11
eo/src/es/eoEsMutate.h
View file

@ -65,7 +65,7 @@ template <class EOT>
class eoEsMutate: public eoMonOp< EOT > { class eoEsMutate: public eoMonOp< EOT > {
public: public:
typedef EOT::Fitness FitT; typedef typename EOT::Fitness FitT;
/** Initialization /** Initialization
parameters: parameters:
@ -156,7 +156,8 @@ public:
*/ */
double global = exp(TauGlb * rng.normal()); double global = exp(TauGlb * rng.normal());
for (unsigned i = 0; i < _eo.size(); i++) unsigned i;
for (i = 0; i < _eo.size(); i++)
{ {
double stdev = _eo.stdevs[i]; double stdev = _eo.stdevs[i];
stdev *= global * exp(TauLcl * rng.normal()); stdev *= global * exp(TauLcl * rng.normal());
@ -230,14 +231,14 @@ public:
private : private :
void init(eoEsSimple<FitT>&, eoEsMutationInit& _init) void init(eoEsSimple<FitT>, eoEsMutationInit& _init)
{ {
unsigned size = bounds.chromSize(); unsigned size = bounds.chromSize();
TauLcl = _init.TauLcl(); TauLcl = _init.TauLcl();
TauLcl /= sqrt((double) size); TauLcl /= sqrt((double) size);
} }
void init(eoEsStdev<FitT>&, eoEsMutationInit& _init) void init(eoEsStdev<FitT>, eoEsMutationInit& _init)
{ {
unsigned size = bounds.chromSize(); unsigned size = bounds.chromSize();
@ -249,7 +250,7 @@ public:
TauGlb /= sqrt( 2.0 * ( (double) size ) ); TauGlb /= sqrt( 2.0 * ( (double) size ) );
} }
void init(eoEsFull<FitT>&, eoEsMutationInit& _init) void init(eoEsFull<FitT>, eoEsMutationInit& _init)
{ {
init(eoEsStdev<FitT>(), _init); init(eoEsStdev<FitT>(), _init);
TauBeta = _init.TauBeta(); TauBeta = _init.TauBeta();