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

Modified to use eoRealBounds rather than eoEsObjectiveBounds

Browse source
This commit is contained in:
evomarc 2001-01-28 07:31:34 +00:00
commit 0f985c627e
1 changed files with 9 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,7 +37,7 @@
#include <es/eoEsSimple.h> #include <es/eoEsSimple.h>
#include <es/eoEsStdev.h> #include <es/eoEsStdev.h>
#include <es/eoEsFull.h> #include <es/eoEsFull.h>
#include <es/eoEsObjectiveBounds.h> #include <es/eoRealBounds.h>
#include <eoOp.h> #include <eoOp.h>
@ -73,7 +73,7 @@ public:
@param _init proxy class for initializating the three parameters eoEsMutate needs @param _init proxy class for initializating the three parameters eoEsMutate needs
@param _bounds the bounds for the objective variables @param _bounds the bounds for the objective variables
*/ */
eoEsMutate(eoEsMutationInit& _init, eoEsObjectiveBounds& _bounds) : bounds(_bounds) eoEsMutate(eoEsMutationInit& _init, eoRealVectorBounds& _bounds) : bounds(_bounds)
{ {
init(EOT(), _init); // initialize on actual type used init(EOT(), _init); // initialize on actual type used
} }
@ -102,9 +102,8 @@ public:
{ {
_eo[i] += _eo.stdev * rng.normal(); _eo[i] += _eo.stdev * rng.normal();
} }
bounds.foldsInBounds(_eo);
keepInBounds(_eo);
_eo.invalidate(); _eo.invalidate();
} }
@ -136,8 +135,8 @@ public:
_eo[i] += stdev * rng.normal(); _eo[i] += stdev * rng.normal();
} }
keepInBounds(_eo); bounds.foldsInBounds(_eo);
_eo.invalidate(); _eo.invalidate();
} }
@ -219,34 +218,23 @@ public:
for (i = 0; i < _eo.size(); i++) for (i = 0; i < _eo.size(); i++)
_eo[i] += VarStp[i]; _eo[i] += VarStp[i];
keepInBounds(_eo); bounds.foldsInBounds(_eo);
_eo.invalidate(); _eo.invalidate();
} }
void keepInBounds(eoFixedLength<FitT, double>& _eo) const
{
for (unsigned i = 0; i < _eo.size(); ++i)
{
if (_eo[i] < bounds.minimum(i))
_eo[i] = bounds.minimum(i);
else if (_eo[i] > bounds.maximum(i))
_eo[i] = bounds.maximum(i);
}
}
private : private :
void init(eoEsSimple<FitT>, eoEsMutationInit& _init) void init(eoEsSimple<FitT>, eoEsMutationInit& _init)
{ {
unsigned size = bounds.chromSize(); unsigned size = bounds.size();
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.size();
TauLcl = _init.TauLcl(); TauLcl = _init.TauLcl();
TauGlb = _init.TauGlb(); TauGlb = _init.TauGlb();
@ -268,7 +256,7 @@ public:
double TauGlb; /* Global factor for mutation of std deviations */ double TauGlb; /* Global factor for mutation of std deviations */
double TauBeta; /* Factor for mutation of correlation parameters */ double TauBeta; /* Factor for mutation of correlation parameters */
eoEsObjectiveBounds& bounds; eoRealVectorBounds& bounds;
static const double stdev_eps; static const double stdev_eps;
}; };