7 changed files with
13 additions and
1 deletions
|
|
|
|
@ -82,6 +82,8 @@ public:
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual std::string className(void) const { return "eoCombinedContinue"; }
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
std::vector<eoContinue<EOT>*> continuators;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
@ -33,7 +33,11 @@
|
|
|
|
|
* false for termination
|
|
|
|
|
*/
|
|
|
|
|
template< class EOT>
|
|
|
|
|
class eoContinue : public eoUF<const eoPop<EOT>&, bool> {};
|
|
|
|
|
class eoContinue : public eoUF<const eoPop<EOT>&, bool>
|
|
|
|
|
{
|
|
|
|
|
public:
|
|
|
|
|
virtual std::string className(void) const { return "eoContinue"; }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -65,6 +65,8 @@ public:
|
|
|
|
|
return false;
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual std::string className(void) const { return "eoCtrlCContinue"; }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -59,6 +59,7 @@ public:
|
|
|
|
|
return repTotalEvaluations;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
virtual std::string className(void) const { return "eoEvalContinue"; }
|
|
|
|
|
private:
|
|
|
|
|
eoEvalFuncCounter<EOT> & eval;
|
|
|
|
|
unsigned long repTotalEvaluations;
|
|
|
|
|
|
|
|
|
|
@ -57,6 +57,7 @@ public:
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual std::string className(void) const { return "eoFitContinue"; }
|
|
|
|
|
private:
|
|
|
|
|
FitnessType maximum;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
@ -73,6 +73,7 @@ public:
|
|
|
|
|
return repTotalGenerations;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
virtual std::string className(void) const { return "eoGenContinue"; }
|
|
|
|
|
private:
|
|
|
|
|
unsigned long repTotalGenerations;
|
|
|
|
|
unsigned long thisGenerationPlaceHolder;
|
|
|
|
|
|
|
|
|
|
@ -94,6 +94,7 @@ public:
|
|
|
|
|
virtual unsigned long steadyGenerations( )
|
|
|
|
|
{ return repSteadyGenerations; };
|
|
|
|
|
|
|
|
|
|
virtual std::string className(void) const { return "eoSteadyFitContinue"; }
|
|
|
|
|
private:
|
|
|
|
|
unsigned long repMinGenerations;
|
|
|
|
|
unsigned long repSteadyGenerations;
|
|
|
|
|
|