From 97ced89f9a10dda51c397f3a4eeb8385541ec94d Mon Sep 17 00:00:00 2001 From: liefooga Date: Tue, 19 Jun 2007 09:29:50 +0000 Subject: [PATCH] update to add a new feature (AggregativeComparator) git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@336 331e1502-861f-0410-8da2-ba01fb791d7f --- branches/paradiseo-moeo-1.0/src/do/make_ea_moeo.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/branches/paradiseo-moeo-1.0/src/do/make_ea_moeo.h b/branches/paradiseo-moeo-1.0/src/do/make_ea_moeo.h index 2bcbcfbdf..4a72fabfc 100755 --- a/branches/paradiseo-moeo-1.0/src/do/make_ea_moeo.h +++ b/branches/paradiseo-moeo-1.0/src/do/make_ea_moeo.h @@ -126,7 +126,7 @@ moeoEA < MOEOT > & do_make_ea_moeo(eoParser & _parser, eoState & _state, eoEvalF /* the comparator strategy */ string & comparatorParam = _parser.createParam(string("FitnessThenDiversity"), "comparator", - "Comparator scheme: FitnessThenDiversity or DiversityThenFitness", 'C', "Evolution Engine").value(); + "Comparator scheme: FitnessThenDiversity, DiversityThenFitness or Aggregative", 'C', "Evolution Engine").value(); moeoComparator < MOEOT > * comparator; if (comparatorParam == string("FitnessThenDiversity")) { @@ -136,6 +136,10 @@ moeoEA < MOEOT > & do_make_ea_moeo(eoParser & _parser, eoState & _state, eoEvalF { comparator = new moeoDiversityThenFitnessComparator < MOEOT> (); } + else if (comparatorParam == string("Aggregative")) + { + comparator = new moeoAggregativeComparator < MOEOT> (); + } else { string stmp = string("Invalid comparator strategy: ") + comparatorParam;