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

update for deleting roulette

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@270 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
liefooga 2007-04-17 16:17:20 +00:00
commit 6adfd7bbc4
3 changed files with 0 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/paradiseo-moeo/src/do/make_ea_moeo.h
View file

@ -35,7 +35,6 @@
#include <moeoIndicatorBasedFitnessAssignment.h>
#include <moeoRandomSelect.h>
#include <moeoReplacement.h>
#include <moeoRouletteSelect.h>
#include <moeoSelectOne.h>
#include <moeoStochTournamentSelect.h>
#include <metric/moeoNormalizedSolutionVsSolutionBinaryMetric.h>

1
trunk/paradiseo-moeo/src/moeo
View file

@ -41,7 +41,6 @@
#include <moeoObjectiveVector.h>
#include <moeoRandomSelect.h>
#include <moeoReplacement.h>
#include <moeoRouletteSelect.h>
#include <moeoSelectFromPopAndArch.h>
#include <moeoSelectOne.h>
#include <moeoStochTournamentSelect.h>

82
trunk/paradiseo-moeo/src/moeoRouletteSelect.h
View file

@ -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 <moeoSelectOne.h>
#include <moeoSelectors.h>
/**
* Selection strategy that selects ONE individual by using roulette wheel process.
*/
template < class 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
*/
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_ */