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

des pow corrigé

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1866 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
verel 2010-06-22 16:18:03 +00:00
commit 772f4a67c4
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/paradiseo-mo/src/problems/eval/moPopBitEval.h
View file

@ -65,9 +65,9 @@ public:
eval(_sol[s]); eval(_sol[s]);
double fit=0; double fit=0;
for (unsigned int i = 0; i < _sol.size(); i++){ 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.setSubFit(_sol[s].fitness());
_n.fitness(fit); _n.fitness(fit);
_sol[s][b]=!_sol[s][b]; _sol[s][b]=!_sol[s][b];

4
trunk/problems/eval/oneMaxPopEval.h
View file

@ -49,9 +49,9 @@ public:
for (unsigned int i = 0; i < _sol.size(); i++){ for (unsigned int i = 0; i < _sol.size(); i++){
if(_sol[i].invalid()) if(_sol[i].invalid())
eval(_sol[i]); 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); _sol.fitness(fit);
} }