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

update do_make files

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@303 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
liefooga 2007-06-18 15:32:12 +00:00
commit a7e9e6aa13
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
branches/paradiseo-moeo-1.0/src/do/make_checkpoint_moeo.h
View file

@ -44,7 +44,7 @@ eoCheckPoint < MOEOT > & do_make_checkpoint_moeo (eoParser & _parser, eoState &
eoCheckPoint < MOEOT > & checkpoint = _state.storeFunctor(new eoCheckPoint < MOEOT > (_continue)); eoCheckPoint < MOEOT > & checkpoint = _state.storeFunctor(new eoCheckPoint < MOEOT > (_continue));
/* the objective vector type */ /* the objective vector type */
typedef typename MOEOT::ObjectiveVector ObjectiveVector; typedef typename MOEOT::ObjectiveVector ObjectiveVector;
/////////////////// ///////////////////
// Counters // Counters
////////////////// //////////////////

4
branches/paradiseo-moeo-1.0/src/do/make_ea_moeo.h
View file

@ -94,7 +94,7 @@ moeoEA < MOEOT > & do_make_ea_moeo(eoParser & _parser, eoState & _state, eoEvalF
string stmp = string("Invalid binary quality indicator: ") + indicatorParam; string stmp = string("Invalid binary quality indicator: ") + indicatorParam;
throw std::runtime_error(stmp.c_str()); throw std::runtime_error(stmp.c_str());
} }
fitnessAssignment = new moeoIndicatorBasedFitnessAssignment < MOEOT> (metric, kappa); fitnessAssignment = new moeoIndicatorBasedFitnessAssignment < MOEOT > (*metric, kappa);
} }
else else
{ {
@ -181,11 +181,13 @@ moeoEA < MOEOT > & do_make_ea_moeo(eoParser & _parser, eoState & _state, eoEvalF
} }
select = new moeoStochTournamentSelect < MOEOT > (*comparator, tRate); select = new moeoStochTournamentSelect < MOEOT > (*comparator, tRate);
} }
/*
else if (ppSelect.first == string("Roulette")) else if (ppSelect.first == string("Roulette"))
{ {
// TO DO ! // TO DO !
// ... // ...
} }
*/
else if (ppSelect.first == string("Random")) else if (ppSelect.first == string("Random"))
{ {
select = new moeoRandomSelect <MOEOT > (); select = new moeoRandomSelect <MOEOT > ();

2
branches/paradiseo-moeo-1.0/src/do/make_ls_moeo.h
View file

@ -84,7 +84,7 @@ moeoLS < MOEOT, eoPop<MOEOT> & > & do_make_ls_moeo (
string stmp = string("Invalid binary quality indicator: ") + indicatorParam; string stmp = string("Invalid binary quality indicator: ") + indicatorParam;
throw std::runtime_error(stmp.c_str()); throw std::runtime_error(stmp.c_str());
} }
fitnessAssignment = new moeoIndicatorBasedFitnessAssignment < MOEOT> (metric, kappa); fitnessAssignment = new moeoIndicatorBasedFitnessAssignment < MOEOT> (*metric, kappa);
} }
else else
{ {