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

"for" with an "if" inside cut in 2 "for" without "if"

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1204 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2008-06-18 12:30:18 +00:00
commit dfe22b84e2
3 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
trunk/paradiseo-moeo/src/fitness/moeoDominanceCountFitnessAssignment.h
View file

@ -100,14 +100,11 @@ public:
unsigned int j= _pop.size(); unsigned int j= _pop.size();
unsigned int i= archive.size(); unsigned int i= archive.size();
matrix(archive,_pop); matrix(archive,_pop);
for (unsigned int k=0; k<i+j; k++) for (unsigned int k=0; k<i; k++)
{
if (k<i)
archive[k].fitness(matrix.count(k)); archive[k].fitness(matrix.count(k));
else for (unsigned int k=i; k<i+j; k++)
_pop[k-i].fitness(matrix.count(k)); _pop[k-i].fitness(matrix.count(k));
} }
}
void updateByDeleting(eoPop < MOEOT > & _pop, ObjectiveVector & _objVec) void updateByDeleting(eoPop < MOEOT > & _pop, ObjectiveVector & _objVec)
{ {

6
trunk/paradiseo-moeo/src/fitness/moeoDominanceCountRankingFitnessAssignment.h
View file

@ -119,13 +119,11 @@ public:
unsigned int j= archive.size(); unsigned int j= archive.size();
matrix(archive,_pop); matrix(archive,_pop);
for (unsigned int k=0; k<i+j; k++) { for (unsigned int k=0; k<j; k++)
if (k<j)
archive[k].fitness(countRanking(k)); archive[k].fitness(countRanking(k));
else for (unsigned int k=j; k<i+j; k++)
_pop[k-j].fitness(countRanking(k)); _pop[k-j].fitness(countRanking(k));
} }
}
void updateByDeleting(eoPop < MOEOT > & _pop, ObjectiveVector & _objVec) void updateByDeleting(eoPop < MOEOT > & _pop, ObjectiveVector & _objVec)
{ {

7
trunk/paradiseo-moeo/src/fitness/moeoDominanceRankFitnessAssignment.h
View file

@ -104,14 +104,11 @@ public:
unsigned int i= archive.size(); unsigned int i= archive.size();
unsigned int j= _pop.size(); unsigned int j= _pop.size();
matrix(archive, _pop); matrix(archive, _pop);
for (unsigned int k=0; k<i+j; k++) for (unsigned int k=0; k<i; k++)
{
if (k<i)
archive[k].fitness(-(matrix.rank(k)+start)); archive[k].fitness(-(matrix.rank(k)+start));
else for (unsigned int k=i; k<i+j; k++)
_pop[k-i].fitness(-(matrix.rank(k)+start)); _pop[k-i].fitness(-(matrix.rank(k)+start));
} }
}
void updateByDeleting(eoPop < MOEOT > & _pop, ObjectiveVector & _objVec) void updateByDeleting(eoPop < MOEOT > & _pop, ObjectiveVector & _objVec)
{ {