From dfe22b84e2c631b35946726739ae7ca07b9749a2 Mon Sep 17 00:00:00 2001
From: jhumeau <jhumeau@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Wed, 18 Jun 2008 12:30:18 +0000
Subject: [PATCH] "for" with an "if" inside cut in 2 "for" without "if"

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1204 331e1502-861f-0410-8da2-ba01fb791d7f
---
 .../src/fitness/moeoDominanceCountFitnessAssignment.h | 11 ++++-------
 .../moeoDominanceCountRankingFitnessAssignment.h      | 10 ++++------
 .../src/fitness/moeoDominanceRankFitnessAssignment.h  |  9 +++------
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/trunk/paradiseo-moeo/src/fitness/moeoDominanceCountFitnessAssignment.h b/trunk/paradiseo-moeo/src/fitness/moeoDominanceCountFitnessAssignment.h
index 450ec9c69..4a19514a5 100644
--- a/trunk/paradiseo-moeo/src/fitness/moeoDominanceCountFitnessAssignment.h
+++ b/trunk/paradiseo-moeo/src/fitness/moeoDominanceCountFitnessAssignment.h
@@ -100,13 +100,10 @@ public:
         unsigned int j= _pop.size();
         unsigned int i= archive.size();
         matrix(archive,_pop);
-        for (unsigned int k=0; k<i+j; k++)
-        {
-            if (k<i)
-                archive[k].fitness(matrix.count(k));
-            else
-                _pop[k-i].fitness(matrix.count(k));
-        }
+        for (unsigned int k=0; k<i; k++)
+            archive[k].fitness(matrix.count(k));              
+        for (unsigned int k=i; k<i+j; k++)
+        	_pop[k-i].fitness(matrix.count(k));
     }
 
     void updateByDeleting(eoPop < MOEOT > & _pop, ObjectiveVector & _objVec)
diff --git a/trunk/paradiseo-moeo/src/fitness/moeoDominanceCountRankingFitnessAssignment.h b/trunk/paradiseo-moeo/src/fitness/moeoDominanceCountRankingFitnessAssignment.h
index c23c07dbb..0337b4607 100644
--- a/trunk/paradiseo-moeo/src/fitness/moeoDominanceCountRankingFitnessAssignment.h
+++ b/trunk/paradiseo-moeo/src/fitness/moeoDominanceCountRankingFitnessAssignment.h
@@ -119,12 +119,10 @@ public:
         unsigned int j= archive.size();
         matrix(archive,_pop);
 
-        for (unsigned int k=0; k<i+j; k++) {
-            if (k<j)
-                archive[k].fitness(countRanking(k));
-            else
-                _pop[k-j].fitness(countRanking(k));
-        }
+        for (unsigned int k=0; k<j; k++)
+            archive[k].fitness(countRanking(k));
+        for (unsigned int k=j; k<i+j; k++)
+        	_pop[k-j].fitness(countRanking(k));
     }
 
     void updateByDeleting(eoPop < MOEOT > & _pop, ObjectiveVector & _objVec)
diff --git a/trunk/paradiseo-moeo/src/fitness/moeoDominanceRankFitnessAssignment.h b/trunk/paradiseo-moeo/src/fitness/moeoDominanceRankFitnessAssignment.h
index e2b434ff8..0b493b95d 100644
--- a/trunk/paradiseo-moeo/src/fitness/moeoDominanceRankFitnessAssignment.h
+++ b/trunk/paradiseo-moeo/src/fitness/moeoDominanceRankFitnessAssignment.h
@@ -104,13 +104,10 @@ public:
         unsigned int i= archive.size();
         unsigned int j= _pop.size();
         matrix(archive, _pop);
-        for (unsigned int k=0; k<i+j; k++)
-        {
-            if (k<i)
+        for (unsigned int k=0; k<i; k++)
                 archive[k].fitness(-(matrix.rank(k)+start));
-            else
-                _pop[k-i].fitness(-(matrix.rank(k)+start));
-        }
+        for (unsigned int k=i; k<i+j; k++)
+        	_pop[k-i].fitness(-(matrix.rank(k)+start));
     }
 
     void updateByDeleting(eoPop < MOEOT > & _pop, ObjectiveVector & _objVec)