diff --git a/eo/src/utils/eoStat.h b/eo/src/utils/eoStat.h index 4c60ec9b..108f951f 100644 --- a/eo/src/utils/eoStat.h +++ b/eo/src/utils/eoStat.h @@ -33,12 +33,17 @@ /** Base class for all statistics that need to be calculated - over the (unsorted) population + over the (unsorted) population (I guess it is not really necessary? MS) */ template class eoStatBase : public eoUF&, void> {}; +/** + The actual class that will be used as base for all statistics + that need to be calculated over the (unsorted) population + It is an eoStatBase AND an eoValueParam so it can be used in Monitors. +*/ template class eoStat : public eoValueParam, public eoStatBase { @@ -54,6 +59,11 @@ class eoSortedStatBase : public eoUF&, void> { }; +/** + The actual class that will be used as base for all statistics + that need to be calculated over the sorted population + It's an eoSortedStatBase AND an eoValueParam so it can be used in Monitors. +*/ template class eoSortedStat : public eoSortedStatBase, public eoValueParam { @@ -88,6 +98,9 @@ public : } }; +/** + Average fitness + Std. dev. of a population, fitness needs to be scalar. +*/ template class eoSecondMomentStats : public eoStat > { @@ -114,6 +127,9 @@ public : } }; +/** + The n_th element fitness in the population (see eoBestFitnessStat) +*/ template class eoNthElementFitnessStat : public eoSortedStat { @@ -153,13 +169,17 @@ public : }; */ + +/** + Best fitness in the population (this is NOT an eoSortedStat but an eoStat) +*/ template class eoBestFitnessStat : public eoNthElementFitnessStat { public : typedef typename EOT::Fitness Fitness; - eoBestFitnessStat(std::string _description = "Best Fitness") : eoNthElementFitnessStat(0, _description) {} + eoBestFitnessStat(std::string _description = "Best ") : eoNthElementFitnessStat(0, _description) {} }; template