From 14216e1af45a6ab9c903463daccd57289c7776bb Mon Sep 17 00:00:00 2001
From: liefooga <liefooga@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Tue, 19 Jun 2007 09:27:32 +0000
Subject: [PATCH] update the use of the comparator

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@332 331e1502-861f-0410-8da2-ba01fb791d7f
---
 .../src/moeoElitistReplacement.h              | 26 +++++--------------
 .../src/moeoEnvironmentalReplacement.h        | 25 +++++-------------
 2 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/branches/paradiseo-moeo-1.0/src/moeoElitistReplacement.h b/branches/paradiseo-moeo-1.0/src/moeoElitistReplacement.h
index f370835eb..cf6e406c7 100644
--- a/branches/paradiseo-moeo-1.0/src/moeoElitistReplacement.h
+++ b/branches/paradiseo-moeo-1.0/src/moeoElitistReplacement.h
@@ -81,8 +81,7 @@ public:
         fitnessAssignment (_parents);
         diversityAssignment (_parents);
         // sorts the whole population according to the comparator
-        Cmp cmp(comparator);
-        std::sort(_parents.begin(), _parents.end(), cmp);
+        std::sort(_parents.begin(), _parents.end(), comparator);
         // finally, resize this global population
         _parents.resize (sz);
         // and clear the offspring population
@@ -98,27 +97,18 @@ protected:
     moeoDiversityAssignment < MOEOT > & diversityAssignment;
     /** a dummy diversity assignment can be used as default */
     moeoDummyDiversityAssignment < MOEOT > defaultDiversity;
-    /** the comparator (used to compare 2 individuals) */
-    moeoComparator < MOEOT > & comparator;
     /** a fitness then diversity comparator can be used as default */
     moeoFitnessThenDiversityComparator < MOEOT > defaultComparator;
-
-
-    /**
-     * This class is used to compare solutions in order to sort the population.
-     */
+    /** this object is used to compare solutions in order to sort the population */
     class Cmp
     {
     public:
-
         /**
          * Ctor.
          * @param _comparator the comparator
          */
-        Cmp(moeoComparator < MOEOT > & _comparator) : comparator(_comparator)
+        Cmp(moeoComparator < MOEOT > & _comp) : comp(_comp)
         {}
-
-
         /**
          * Returns true if _moeo1 is greater than _moeo2 according to the comparator
          * _moeo1 the first individual
@@ -126,16 +116,12 @@ protected:
          */
         bool operator()(const MOEOT & _moeo1, const MOEOT & _moeo2)
         {
-            return comparator(_moeo2,_moeo1);
+            return comp(_moeo2,_moeo1);
         }
-
-
     private:
-
         /** the comparator */
-        moeoComparator < MOEOT > & comparator;
-
-    };
+        moeoComparator < MOEOT > & comp;
+    } comparator;
 
 };
 
diff --git a/branches/paradiseo-moeo-1.0/src/moeoEnvironmentalReplacement.h b/branches/paradiseo-moeo-1.0/src/moeoEnvironmentalReplacement.h
index eeee57c95..78ee0b1fc 100755
--- a/branches/paradiseo-moeo-1.0/src/moeoEnvironmentalReplacement.h
+++ b/branches/paradiseo-moeo-1.0/src/moeoEnvironmentalReplacement.h
@@ -86,13 +86,12 @@ public:
         fitnessAssignment (_parents);
         diversityAssignment (_parents);
         // remove individuals 1 by 1 and update the fitness values
-        Cmp cmp(comparator);
         unsigned worstIdx;
         ObjectiveVector worstObjVec;
         while (_parents.size() > sz)
         {
             // the individual to delete
-            worstIdx = std::min_element(_parents.begin(), _parents.end(), cmp) - _parents.begin();
+            worstIdx = std::min_element(_parents.begin(), _parents.end(), comparator) - _parents.begin();
             worstObjVec = _parents[worstIdx].objectiveVector();
             // remove the woorst individual
             _parents[worstIdx] = _parents.back();
@@ -115,26 +114,18 @@ protected:
     moeoDiversityAssignment < MOEOT > & diversityAssignment;
     /** a dummy diversity assignment can be used as default */
     moeoDummyDiversityAssignment < MOEOT > defaultDiversity;
-    /** the comparator (used to compare 2 individuals) */
-    moeoComparator < MOEOT > & comparator;
     /** a fitness then diversity comparator can be used as default */
     moeoFitnessThenDiversityComparator < MOEOT > defaultComparator;
-
-    /**
-     * This class is used to compare solutions in order to sort the population.
-     */
+    /** this object is used to compare solutions in order to sort the population */
     class Cmp
     {
     public:
-
         /**
          * Ctor.
          * @param _comparator the comparator
          */
-        Cmp(moeoComparator < MOEOT > & _comparator) : comparator(_comparator)
+        Cmp(moeoComparator < MOEOT > & _comp) : comp(_comp)
         {}
-
-
         /**
          * Returns true if _moeo1 is greater than _moeo2 according to the comparator
          * _moeo1 the first individual
@@ -142,16 +133,12 @@ protected:
          */
         bool operator()(const MOEOT & _moeo1, const MOEOT & _moeo2)
         {
-            return comparator(_moeo1,_moeo2);
+            return comp(_moeo1,_moeo2);
         }
-
-
     private:
-
         /** the comparator */
-        moeoComparator < MOEOT > & comparator;
-
-    };
+        moeoComparator < MOEOT > & comp;
+    } comparator;
 
 };