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

Added a failed boolean to indicate if fitness evaluation succeeded ( useful if programs are involved, where fitness evaluation can fail for some indis)

Browse source 
Avg Stats are now only evaluated of individuals if this bool is false!
This commit is contained in:
okoenig 2004-06-14 11:24:37 +00:00
commit 16e09360c9
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
eo/src/utils/eoAssembledFitnessStat.h
View file

@ -40,6 +40,7 @@
Average fitness values of a population, where the fitness is
of type eoScalarAssembledFitness. Specify in the constructor,
for which fitness term (index) the average should be evaluated.
Only values of object where the failed boolean = false is set are counted.
*/
#ifdef _MSC_VER
template <class EOT>
@ -61,10 +62,15 @@ public :
if ( whichFitnessTerm >= _pop[0].fitness().size() )
throw std::logic_error("Fitness term requested out of range");
double result =0.0;
for (typename eoPop<EOT>::const_iterator it = _pop.begin(); it != _pop.end(); ++it)
result+= it->fitness()[whichFitnessTerm];
double result =0.0;
unsigned count = 0;
for (typename eoPop<EOT>::const_iterator it = _pop.begin(); it != _pop.end(); ++it){
if ( it->fitness().failed == false ){
result+= it->fitness()[whichFitnessTerm];
++count;
}
}
value().clear();
value() = result / _pop.size();