diff --git a/branches/paradiseo-moeo-1.0/src/moeoElitistReplacement.h b/branches/paradiseo-moeo-1.0/src/moeoElitistReplacement.h index db2a7c6af..2f8745e74 100644 --- a/branches/paradiseo-moeo-1.0/src/moeoElitistReplacement.h +++ b/branches/paradiseo-moeo-1.0/src/moeoElitistReplacement.h @@ -45,12 +45,8 @@ public: * @param _evalDiversity the diversity assignment strategy */ moeoElitistReplacement (moeoFitnessAssignment < MOEOT > & _evalFitness, moeoDiversityAssignment < MOEOT > & _evalDiversity) : - evalFitness (_evalFitness), evalDiversity (_evalDiversity) - { - // a moeoFitThenDivComparator is used as default - moeoFitnessThenDiversityComparator < MOEOT > &fitThenDivComparator; - comparator = fitThenDivComparator; - } + evalFitness (_evalFitness), evalDiversity (_evalDiversity), comparator (*(new moeoFitnessThenDiversityComparator < MOEOT >)) + {} /** @@ -59,12 +55,8 @@ public: * @param _comparator the comparator (used to compare 2 individuals) */ moeoElitistReplacement (moeoFitnessAssignment < MOEOT > & _evalFitness, moeoComparator < MOEOT > & _comparator) : - evalFitness (_evalFitness), comparator (_comparator) - { - // a dummy diversity is used as default - moeoDummyDiversityAssignment < MOEOT > &dummyDiversityAssignment; - evalDiversity = dummyDiversityAssignment; - } + evalFitness (_evalFitness), evalDiversity (*(new moeoDummyDiversityAssignment < MOEOT >)), comparator (_comparator) + {} /** @@ -72,15 +64,9 @@ public: * A moeoFitThenDivComparator and a dummy diversity are used as default. * @param _evalFitness the fitness assignment strategy */ - moeoElitistReplacement (moeoFitnessAssignment < MOEOT > & _evalFitness) : evalFitness (_evalFitness) - { - // a dummy diversity is used as default - moeoDummyDiversityAssignment < MOEOT > & dummyDiversityAssignment; - evalDiversity = dummyDiversityAssignment; - // a moeoFitThenDivComparator is used as default - moeoFitnessThenDiversityComparator < MOEOT > & fitThenDivComparator; - comparator = fitThenDivComparator; - } + moeoElitistReplacement (moeoFitnessAssignment < MOEOT > & _evalFitness) : + evalFitness (_evalFitness), evalDiversity (*(new moeoDummyDiversityAssignment < MOEOT >)), comparator (*(new moeoFitnessThenDiversityComparator < MOEOT >)) + {} /** @@ -121,7 +107,6 @@ protected: /** the comparator (used to compare 2 individuals) */ moeoComparator < MOEOT > & comparator; - /** * This class is used to compare solutions in order to sort the population. */ diff --git a/branches/paradiseo-moeo-1.0/src/moeoEnvironmentalReplacement.h b/branches/paradiseo-moeo-1.0/src/moeoEnvironmentalReplacement.h index 3eed043a6..796ac9682 100755 --- a/branches/paradiseo-moeo-1.0/src/moeoEnvironmentalReplacement.h +++ b/branches/paradiseo-moeo-1.0/src/moeoEnvironmentalReplacement.h @@ -47,12 +47,8 @@ public: * @param _evalDiversity the diversity assignment strategy */ moeoEnvironmentalReplacement (moeoFitnessAssignment < MOEOT > & _evalFitness, moeoDiversityAssignment < MOEOT > & _evalDiversity) : - evalFitness (_evalFitness), evalDiversity (_evalDiversity) - { - // a moeoFitThenDivComparator is used as default - moeoFitnessThenDiversityComparator < MOEOT > &fitThenDivComparator; - comparator = fitThenDivComparator; - } + evalFitness (_evalFitness), evalDiversity (_evalDiversity), comparator (*(new moeoFitnessThenDiversityComparator < MOEOT >)) + {} /** @@ -61,12 +57,8 @@ public: * @param _comparator the comparator (used to compare 2 individuals) */ moeoEnvironmentalReplacement (moeoFitnessAssignment < MOEOT > & _evalFitness, moeoComparator < MOEOT > & _comparator) : - evalFitness (_evalFitness), comparator (_comparator) - { - // a dummy diversity is used as default - moeoDummyDiversityAssignment < MOEOT > &dummyDiversityAssignment; - evalDiversity = dummyDiversityAssignment; - } + evalFitness (_evalFitness), evalDiversity (*(new moeoDummyDiversityAssignment < MOEOT >)), comparator (_comparator) + {} /** @@ -74,15 +66,10 @@ public: * A moeoFitThenDivComparator and a dummy diversity are used as default. * @param _evalFitness the fitness assignment strategy */ - moeoEnvironmentalReplacement (moeoFitnessAssignment < MOEOT > & _evalFitness) : evalFitness (_evalFitness) - { - // a dummy diversity is used as default - moeoDummyDiversityAssignment < MOEOT > & dummyDiversityAssignment; - evalDiversity = dummyDiversityAssignment; - // a moeoFitThenDivComparator is used as default - moeoFitnessThenDiversityComparator < MOEOT > & fitThenDivComparator; - comparator = fitThenDivComparator; - } + moeoEnvironmentalReplacement (moeoFitnessAssignment < MOEOT > & _evalFitness) : + evalFitness (_evalFitness), evalDiversity (*(new moeoDummyDiversityAssignment < MOEOT >)), comparator (*(new moeoFitnessThenDiversityComparator < MOEOT >)) + {} + /** * Replaces the first population by adding the individuals of the second one, sorting with a moeoComparator and resizing the whole population obtained.