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

delete comparator

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@325 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
liefooga 2007-06-19 07:55:53 +00:00
commit 303662d978
1 changed files with 11 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

34
branches/paradiseo-moeo-1.0/src/moeoRouletteSelect.h
View file

@ -18,20 +18,18 @@
/** /**
* Selection strategy that selects ONE individual by using roulette wheel process. * 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 > template < class MOEOT >
class moeoRouletteSelect:public moeoSelectOne <MOEOT> class moeoRouletteSelect:public moeoSelectOne < MOEOT >
{ {
public: public:
/** /**
* Full Ctor. * Ctor.
* @param _comparator the comparator (used to compare 2 individuals)
* @param _tSize the number of individuals in the tournament (default: 2) * @param _tSize the number of individuals in the tournament (default: 2)
*/ */
moeoRouletteSelect (moeoComparator < MOEOT > &_comparator, unsigned _tSize = 2): moeoRouletteSelect (unsigned _tSize = 2) : tSize (_tSize)
comparator (_comparator), tSize (_tSize)
{ {
// consistency check // consistency check
if (tSize < 2) if (tSize < 2)
@ -43,37 +41,19 @@ public:
} }
/**
* 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 * Apply the tournament to the given population
* @param _pop the population
*/ */
const MOEOT & operator () (const eoPop < MOEOT > &_pop) const MOEOT & operator () (const eoPop < MOEOT > & _pop)
{ {
// use the selector // use the selector
return mo_roulette_wheel(_pop,tSize); //comparator ?? return mo_roulette_wheel(_pop,tSize);
} }
protected: protected:
/** comparator */
moeoComparator < MOEOT > &comparator;
/** size */ /** size */
double & tSize; double & tSize;