From fbe28cc8ba5a76e5d1a8c5e4cb5b7561eac04289 Mon Sep 17 00:00:00 2001 From: liefooga Date: Fri, 21 Dec 2007 08:52:53 +0000 Subject: [PATCH] update CtrlC + param names git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@851 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/paradiseo-moeo/src/do/make_continue_moeo.h | 2 +- trunk/paradiseo-moeo/src/do/make_ea_moeo.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/trunk/paradiseo-moeo/src/do/make_continue_moeo.h b/trunk/paradiseo-moeo/src/do/make_continue_moeo.h index 215ef6e17..84695d7ee 100755 --- a/trunk/paradiseo-moeo/src/do/make_continue_moeo.h +++ b/trunk/paradiseo-moeo/src/do/make_continue_moeo.h @@ -110,7 +110,7 @@ eoContinue & do_make_continue_moeo(eoParser& _parser, eoState& _state, eo // the CtrlC interception (Linux only I'm afraid) eoCtrlCContinue *ctrlCCont; eoValueParam& ctrlCParam = _parser.createParam(true, "CtrlC", "Terminate current generation upon Ctrl C",'C', "Stopping criterion"); - if (_parser.isItThere(ctrlCParam)) + if (ctrlCParam.value()) { ctrlCCont = new eoCtrlCContinue; // store diff --git a/trunk/paradiseo-moeo/src/do/make_ea_moeo.h b/trunk/paradiseo-moeo/src/do/make_ea_moeo.h index 2192e5d30..6f98101ab 100755 --- a/trunk/paradiseo-moeo/src/do/make_ea_moeo.h +++ b/trunk/paradiseo-moeo/src/do/make_ea_moeo.h @@ -99,7 +99,7 @@ moeoEA < MOEOT > & do_make_ea_moeo(eoParser & _parser, eoState & _state, eoEvalF std::string & indicatorParam = _parser.createParam(std::string("Epsilon"), "indicator", "Binary indicator for IndicatorBased: Epsilon, Hypervolume", 'i', "Evolution Engine").value(); - double rho = _parser.createParam(1.1, "rho", "reference point for the hypervolume indicator", 'r', + double rho = _parser.createParam(1.1, "rho", "reference point for the hypervolume indicator", '\0', "Evolution Engine").value(); double kappa = _parser.createParam(0.05, "kappa", "Scaling factor kappa for IndicatorBased", 'k', "Evolution Engine").value(); @@ -177,7 +177,7 @@ moeoEA < MOEOT > & do_make_ea_moeo(eoParser & _parser, eoState & _state, eoEvalF /* the comparator strategy */ std::string & comparatorParam = _parser.createParam(std::string("FitnessThenDiversity"), "comparator", - "Comparator scheme: FitnessThenDiversity, DiversityThenFitness or Aggregative", 'C', "Evolution Engine").value(); + "Comparator scheme: FitnessThenDiversity, DiversityThenFitness or Aggregative", 'c', "Evolution Engine").value(); moeoComparator < MOEOT > * comparator; if (comparatorParam == std::string("FitnessThenDiversity")) {