From a7e9e6aa13c11d014ce614b64b11cabca57956ef Mon Sep 17 00:00:00 2001 From: liefooga Date: Mon, 18 Jun 2007 15:32:12 +0000 Subject: [PATCH] update do_make files git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@303 331e1502-861f-0410-8da2-ba01fb791d7f --- branches/paradiseo-moeo-1.0/src/do/make_checkpoint_moeo.h | 2 +- branches/paradiseo-moeo-1.0/src/do/make_ea_moeo.h | 4 +++- branches/paradiseo-moeo-1.0/src/do/make_ls_moeo.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/branches/paradiseo-moeo-1.0/src/do/make_checkpoint_moeo.h b/branches/paradiseo-moeo-1.0/src/do/make_checkpoint_moeo.h index 65957e51f..6f92171a0 100755 --- a/branches/paradiseo-moeo-1.0/src/do/make_checkpoint_moeo.h +++ b/branches/paradiseo-moeo-1.0/src/do/make_checkpoint_moeo.h @@ -44,7 +44,7 @@ eoCheckPoint < MOEOT > & do_make_checkpoint_moeo (eoParser & _parser, eoState & eoCheckPoint < MOEOT > & checkpoint = _state.storeFunctor(new eoCheckPoint < MOEOT > (_continue)); /* the objective vector type */ typedef typename MOEOT::ObjectiveVector ObjectiveVector; - + /////////////////// // Counters ////////////////// 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 513a29974..2bcbcfbdf 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 @@ -94,7 +94,7 @@ moeoEA < MOEOT > & do_make_ea_moeo(eoParser & _parser, eoState & _state, eoEvalF string stmp = string("Invalid binary quality indicator: ") + indicatorParam; throw std::runtime_error(stmp.c_str()); } - fitnessAssignment = new moeoIndicatorBasedFitnessAssignment < MOEOT> (metric, kappa); + fitnessAssignment = new moeoIndicatorBasedFitnessAssignment < MOEOT > (*metric, kappa); } else { @@ -181,11 +181,13 @@ moeoEA < MOEOT > & do_make_ea_moeo(eoParser & _parser, eoState & _state, eoEvalF } select = new moeoStochTournamentSelect < MOEOT > (*comparator, tRate); } + /* else if (ppSelect.first == string("Roulette")) { // TO DO ! // ... } + */ else if (ppSelect.first == string("Random")) { select = new moeoRandomSelect (); diff --git a/branches/paradiseo-moeo-1.0/src/do/make_ls_moeo.h b/branches/paradiseo-moeo-1.0/src/do/make_ls_moeo.h index aac044557..680d76fb7 100755 --- a/branches/paradiseo-moeo-1.0/src/do/make_ls_moeo.h +++ b/branches/paradiseo-moeo-1.0/src/do/make_ls_moeo.h @@ -84,7 +84,7 @@ moeoLS < MOEOT, eoPop & > & do_make_ls_moeo ( string stmp = string("Invalid binary quality indicator: ") + indicatorParam; throw std::runtime_error(stmp.c_str()); } - fitnessAssignment = new moeoIndicatorBasedFitnessAssignment < MOEOT> (metric, kappa); + fitnessAssignment = new moeoIndicatorBasedFitnessAssignment < MOEOT> (*metric, kappa); } else {