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

Added a comment to stdout upon termination - so we know why we stop in case

Browse source 
of multiple criteria
This commit is contained in:
evomarc 2000-11-28 15:35:09 +00:00
commit e4b735b17f
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
eo/src/eoFitContinue.h
View file

@ -47,8 +47,15 @@ public:
* reached. Assumes pop is not sorted! */
virtual bool operator() ( const eoPop<EOT>& _pop )
{
return (_pop.nth_element_fitness(0) < maximum);
}
FitnessType bestCurrentFitness = _pop.nth_element_fitness(0);
if (bestCurrentFitness >= maximum)
{
cout << "STOP in eoFitContinue: Best fitness has reached " <<
bestCurrentFitness << "\n";
return false;
}
return true;
}
private:
FitnessType maximum;

7
eo/src/eoGenContinue.h
View file

@ -52,7 +52,12 @@ public:
virtual bool operator() ( const eoPop<EOT>& _vEO ) {
thisGeneration++;
// cout << " [" << thisGeneration << "] ";
return (thisGeneration < repTotalGenerations) ; // for the postincrement
if (thisGeneration >= repTotalGenerations)
{
cout << "STOP in eoGenContinue: Reached maximum number of generations\n";
return false;
}
return true;
}
/** Sets the number of generations to reach