diff --git a/trunk/paradiseo-moeo/src/do/make_ea_moeo.h b/trunk/paradiseo-moeo/src/do/make_ea_moeo.h index 513a29974..f442a04e6 100755 --- a/trunk/paradiseo-moeo/src/do/make_ea_moeo.h +++ b/trunk/paradiseo-moeo/src/do/make_ea_moeo.h @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include diff --git a/trunk/paradiseo-moeo/src/moeo b/trunk/paradiseo-moeo/src/moeo index 5a978a61d..dbb9a7ba1 100644 --- a/trunk/paradiseo-moeo/src/moeo +++ b/trunk/paradiseo-moeo/src/moeo @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include diff --git a/trunk/paradiseo-moeo/src/moeoRouletteSelect.h b/trunk/paradiseo-moeo/src/moeoRouletteSelect.h deleted file mode 100644 index 040c52609..000000000 --- a/trunk/paradiseo-moeo/src/moeoRouletteSelect.h +++ /dev/null @@ -1,82 +0,0 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -//----------------------------------------------------------------------------- -// moeoRouletteSelect.h -// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2007 -/* - This library... - - Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr - */ -//----------------------------------------------------------------------------- - -#ifndef MOEOROULETTESELECT_H_ -#define MOEOROULETTESELECT_H_ - -#include -#include - -/** - * Selection strategy that selects ONE individual by using roulette wheel process. - */ -template < class MOEOT > -class moeoRouletteSelect:public moeoSelectOne -{ -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 - */ - const MOEOT & operator () (const eoPop < MOEOT > &_pop) - { - // use the selector - return mo_roulette_wheel(_pop,tSize); //comparator ?? - } - - -protected: - - /** comparator */ - moeoComparator < MOEOT > &comparator; - /** size */ - double & tSize; - -}; - -#endif /*MOEOROULETTESELECT_H_ */