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

Elitist replacement update (still don't work)

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@200 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
liefooga 2007-02-26 16:22:02 +00:00
commit a54bc068e3
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
branches/paradiseo-moeo-1.0/src/moeoElitistReplacement.h
View file

@ -32,7 +32,7 @@ public:
* @param _evalDiversity the diversity assignment strategy * @param _evalDiversity the diversity assignment strategy
* @param _comparator the comparator (used to compare 2 individuals) * @param _comparator the comparator (used to compare 2 individuals)
*/ */
moeoElitistReplacement (moeoFitnessAssignment < MOEOT > & _evalFitness, moeoDiversityAssignment < MOEOT > & _evalDiversity, moeoComparator < MOEOT > _comparator) : moeoElitistReplacement (moeoFitnessAssignment < MOEOT > & _evalFitness, moeoDiversityAssignment < MOEOT > & _evalDiversity, moeoComparator < MOEOT > & _comparator) :
evalFitness (_evalFitness), evalDiversity (_evalDiversity), comparator (_comparator) evalFitness (_evalFitness), evalDiversity (_evalDiversity), comparator (_comparator)
{} {}
@ -55,7 +55,7 @@ public:
* @param _evalFitness the fitness assignment strategy * @param _evalFitness the fitness assignment strategy
* @param _comparator the comparator (used to compare 2 individuals) * @param _comparator the comparator (used to compare 2 individuals)
*/ */
moeoElitistReplacement (moeoFitnessAssignment < MOEOT > & _evalFitness, moeoComparator < MOEOT > _comparator) : moeoElitistReplacement (moeoFitnessAssignment < MOEOT > & _evalFitness, moeoComparator < MOEOT > & _comparator) :
evalFitness (_evalFitness), comparator (_comparator) evalFitness (_evalFitness), comparator (_comparator)
{ {
// a dummy diversity is used as default // a dummy diversity is used as default
@ -71,10 +71,10 @@ public:
moeoElitistReplacement (moeoFitnessAssignment < MOEOT > & _evalFitness) : evalFitness (_evalFitness) moeoElitistReplacement (moeoFitnessAssignment < MOEOT > & _evalFitness) : evalFitness (_evalFitness)
{ {
// a dummy diversity is used as default // a dummy diversity is used as default
moeoDummyDiversityAssignment < MOEOT > &dummyDiversityAssignment; moeoDummyDiversityAssignment < MOEOT > & dummyDiversityAssignment;
evalDiversity = dummyDiversityAssignment; evalDiversity = dummyDiversityAssignment;
// a moeoFitThenDivComparator is used as default // a moeoFitThenDivComparator is used as default
moeoFitnessThenDiversityComparator < MOEOT > &fitThenDivComparator; moeoFitnessThenDiversityComparator < MOEOT > & fitThenDivComparator;
comparator = fitThenDivComparator; comparator = fitThenDivComparator;
} }
@ -104,11 +104,11 @@ public:
protected: protected:
/** the fitness assignment strategy */ /** the fitness assignment strategy */
moeoFitnessAssignment < MOEOT > &evalFitness; moeoFitnessAssignment < MOEOT > & evalFitness;
/** the diversity assignment strategy */ /** the diversity assignment strategy */
moeoDiversityAssignment < MOEOT > &evalDiversity; moeoDiversityAssignment < MOEOT > & evalDiversity;
/** the comparator (used to compare 2 individuals) */ /** the comparator (used to compare 2 individuals) */
moeoComparator < MOEOT > &comparator;. moeoComparator < MOEOT > & comparator;
}; };