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

Well, what do you know, major commit.

Browse source 
Changed the signature of eoMon, eoBin and eoQuadOp to return a bool,
without invalidating fitness. Added a set of invalidators to take over
that job (see for instance eoSGA and eoSGATransform how this can transparantly used)

Derived eoState from eoFunctorStore (for convenience, from a design perspective this may sound wrong)

Added a wrap_op function that does the wrapping for you (see eoOpContainer how this made this functor
exceedingly less hairy). Checked all the tests removed the eoGeneric*Op family (not needed anymore)
and of course changed all the operators to reflect the change (and found a few that didn't
invalidate the fitness, thus really pointing out the advantage of the current approach)
This commit is contained in:
maartenkeijzer 2001-02-14 10:35:26 +00:00
commit 3a9b5a0e7e
30 changed files with 651 additions and 564 deletions
Download patch file Download diff file Expand all files Collapse all files

32
eo/src/other/eoExternalOpFunctions.h
View file

@ -46,13 +46,13 @@ class eoExternalInit : public eoInit<ExternalEO>
{
public :
eoExternalInit(External (*_init)(void)) : init(_init) {}
void operator()(ExternalEO& _eo)
{
_eo = (*init)();
void operator()(ExternalEO& _eo)
{
_eo = (*init)();
_eo.invalidate();
}
@ -76,7 +76,7 @@ class eoExternalEvalFunc : public eoEvalFunc<ExternalEO>
eoExternalEvalFunc(F (*_eval)(const External&)) : eval(_eval) {}
void operator()(ExternalEO& eo)
void operator()(ExternalEO& eo)
{
if (eo.invalid())
eo.fitness( (*eval)(eo) );
@ -93,8 +93,8 @@ class eoExternalEvalFunc : public eoEvalFunc<ExternalEO>
bool func(External&);
Where External is the user defined struct or class.
Where External is the user defined struct or class.
The function should return true when it changed something, false otherwise
*/
@ -105,10 +105,9 @@ class eoExternalMonOp : public eoMonOp<ExternalEO>
eoExternalMonOp(bool (*_mutate)(External&)) : mutate(_mutate) {}
void operator()(ExternalEO& eo)
bool operator()(ExternalEO& eo)
{
if ((*mutate)(eo))
eo.invalidate();
return (*mutate)(eo);
}
private :
@ -132,10 +131,9 @@ class eoExternalBinOp : public eoBinOp<ExternalEO>
eoExternalBinOp(bool (*_binop)(External&, const External&)) : binop(_binop) {}
void operator()(ExternalEO& eo1, const ExternalEO& eo2)
bool operator()(ExternalEO& eo1, const ExternalEO& eo2)
{
if ((*binop)(eo1, eo2))
eo1.invalidate();
return (*binop)(eo1, eo2);
}
private :
@ -159,13 +157,9 @@ class eoExternalQuadOp : public eoQuadOp<ExternalEO>
eoExternalQuadOp(bool (*_quadop)(External&, External&)) : quadop(_quadop) {}
void operator()(ExternalEO& eo1, ExternalEO& eo2)
bool operator()(ExternalEO& eo1, ExternalEO& eo2)
{
if ((*quadop)(eo1, eo2))
{
eo1.invalidate();
eo2.invalidate();
}
return (*quadop)(eo1, eo2);
}
private :