From 303662d978b362eff5df1ec508c5f138a2a9e781 Mon Sep 17 00:00:00 2001
From: liefooga <liefooga@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Tue, 19 Jun 2007 07:55:53 +0000
Subject: [PATCH] delete comparator

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@325 331e1502-861f-0410-8da2-ba01fb791d7f
---
 .../src/moeoRouletteSelect.h                  | 66 +++++++------------
 1 file changed, 23 insertions(+), 43 deletions(-)

diff --git a/branches/paradiseo-moeo-1.0/src/moeoRouletteSelect.h b/branches/paradiseo-moeo-1.0/src/moeoRouletteSelect.h
index 040c52609..58b6a25d5 100644
--- a/branches/paradiseo-moeo-1.0/src/moeoRouletteSelect.h
+++ b/branches/paradiseo-moeo-1.0/src/moeoRouletteSelect.h
@@ -18,63 +18,43 @@
 
 /**
  * Selection strategy that selects ONE individual by using roulette wheel process.
+ * @WARNING This selection only uses fitness values (and not diversity values).
  */
 template < class MOEOT >
-class moeoRouletteSelect:public moeoSelectOne <MOEOT>
+class moeoRouletteSelect:public moeoSelectOne < MOEOT >
 {
 public:
 
-
     /**
-        * Full Ctor.
-        * @param _comparator the comparator (used to compare 2 individuals)
-        * @param _tSize the number of individuals in the tournament (default: 2)
-        */
-    moeoRouletteSelect (moeoComparator < MOEOT > &_comparator, unsigned _tSize = 2):
-            comparator (_comparator), tSize (_tSize)
-    {
-        // consistency check
-        if (tSize < 2)
-        {
-            std::
-            cout << "Warning, Tournament size should be >= 2\nAdjusted to 2\n";
-            tSize = 2;
-        }
-    }
-
-
-    /**
-    * Ctor without comparator. A moeoFitnessThenDiversityComparator is used as default.
-    * @param _tSize the number of individuals in the tournament (default: 2)	 
-    */
-    moeoRouletteSelect (unsigned _tSize = 2):
-            comparator (*(new moeoFitnessThenDiversityComparator < MOEOT > ())),
-            tSize (_tSize)
-    {
-        // consistency check
-        if (tSize < 2)
-        {
-            std::
-            cout << "Warning, Tournament size should be >= 2\nAdjusted to 2\n";
-            tSize = 2;
-        }
-    }
-
-    /**
-     *  Apply the tournament to the given population
+     * Ctor.
+     * @param _tSize the number of individuals in the tournament (default: 2)	 
      */
-    const MOEOT & operator  () (const eoPop < MOEOT > &_pop)
+    moeoRouletteSelect (unsigned _tSize = 2) : tSize (_tSize)
+    {
+        // consistency check
+        if (tSize < 2)
+        {
+            std::
+            cout << "Warning, Tournament size should be >= 2\nAdjusted to 2\n";
+            tSize = 2;
+        }
+    }
+
+
+    /**
+     * Apply the tournament to the given population
+     * @param _pop the population
+     */
+    const MOEOT & operator  () (const eoPop < MOEOT > & _pop)
     {
         // use the selector
-        return mo_roulette_wheel(_pop,tSize); //comparator ??
+        return mo_roulette_wheel(_pop,tSize);
     }
 
 
 protected:
 
-	/** comparator */
-    moeoComparator < MOEOT > &comparator;
-	/** size */
+    /** size */
     double & tSize;
 
 };