From 772f4a67c41128dbffa69dec27e83b8b87dd37ad Mon Sep 17 00:00:00 2001 From: verel Date: Tue, 22 Jun 2010 16:18:03 +0000 Subject: [PATCH] =?UTF-8?q?des=20pow=20corrig=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1866 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/paradiseo-mo/src/problems/eval/moPopBitEval.h | 4 ++-- trunk/problems/eval/oneMaxPopEval.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/trunk/paradiseo-mo/src/problems/eval/moPopBitEval.h b/trunk/paradiseo-mo/src/problems/eval/moPopBitEval.h index 4780a7f6c..fcc4b13b7 100644 --- a/trunk/paradiseo-mo/src/problems/eval/moPopBitEval.h +++ b/trunk/paradiseo-mo/src/problems/eval/moPopBitEval.h @@ -65,9 +65,9 @@ public: eval(_sol[s]); double fit=0; for (unsigned int i = 0; i < _sol.size(); i++){ - fit+=pow(_sol[i].fitness(), p); + fit+=pow((double) _sol[i].fitness(), (int) p); } - fit=pow(fit, (double)1/p); + fit=pow((double) fit, (double)1/p); _n.setSubFit(_sol[s].fitness()); _n.fitness(fit); _sol[s][b]=!_sol[s][b]; diff --git a/trunk/problems/eval/oneMaxPopEval.h b/trunk/problems/eval/oneMaxPopEval.h index 3b1032c21..ecd475ee6 100644 --- a/trunk/problems/eval/oneMaxPopEval.h +++ b/trunk/problems/eval/oneMaxPopEval.h @@ -49,9 +49,9 @@ public: for (unsigned int i = 0; i < _sol.size(); i++){ if(_sol[i].invalid()) eval(_sol[i]); - fit+=pow(_sol[i].fitness(), p); + fit+=pow((double) _sol[i].fitness(), (int) p); } - fit=pow(fit, (double)1/p); + fit=pow((double) fit, (double)1/p); _sol.fitness(fit); }