From a1ce594a38695ccd04d452250e7c84f387e758e7 Mon Sep 17 00:00:00 2001 From: LPTK Date: Thu, 13 Jun 2013 15:37:47 +0200 Subject: [PATCH] cleaning --- mo/src/continuator/moFitnessVarianceStat.h | 15 +++------------ mo/test/t-moFitnessVarianceStat.cpp | 3 --- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/mo/src/continuator/moFitnessVarianceStat.h b/mo/src/continuator/moFitnessVarianceStat.h index 3769c5983..1d4c7f4b6 100644 --- a/mo/src/continuator/moFitnessVarianceStat.h +++ b/mo/src/continuator/moFitnessVarianceStat.h @@ -68,11 +68,6 @@ public : nbSolutionsEncountered = currentAvg = currentVar = 0; firstTime = false; } - /*else if (firstTime) - { - value() = 0.0; - firstTime = false; - }*/ operator()(_sol); } @@ -85,13 +80,9 @@ public : double x = _sol.fitness(); double oldAvg = currentAvg; currentAvg = oldAvg + (x - oldAvg)/nbSolutionsEncountered; - if (nbSolutionsEncountered > 1) // <- not really necessary - { - //value() = (value()/nbSolutionsEncountered + _sol.fitness())/(nbSolutionsEncountered+1); - double oldVar = currentVar; - currentVar = oldVar + (x - oldAvg) * (x - currentAvg); - value() = currentVar/nbSolutionsEncountered; - } + double oldVar = currentVar; + currentVar = oldVar + (x - oldAvg) * (x - currentAvg); + value() = currentVar/nbSolutionsEncountered; } /** diff --git a/mo/test/t-moFitnessVarianceStat.cpp b/mo/test/t-moFitnessVarianceStat.cpp index b90070254..8f343a6ac 100644 --- a/mo/test/t-moFitnessVarianceStat.cpp +++ b/mo/test/t-moFitnessVarianceStat.cpp @@ -19,7 +19,6 @@ double objective_function(const EOT & sol) for ( size_t i = 0; i < sol.size(); ++i ) { - //std::cout << sol[i] << std::endl; sum += sol[i] * sol[i]; } @@ -28,7 +27,6 @@ double objective_function(const EOT & sol) int main(int ac, char** av) { - //moNeighborhoodStat nhStat moFitnessVarianceStat stat; eoEvalFuncPtr< EOT, double > eval( objective_function ); EOT solution(2, 5); @@ -38,7 +36,6 @@ int main(int ac, char** av) solution.invalidate(); eval(solution); stat(solution); - //assert(stat.value() == 1); std::cout << "var: " << stat.value() << std::endl; assert(stat.value() == 625); }