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

update modif select

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@221 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
liefooga 2007-04-13 14:48:46 +00:00
commit f80bc6a49d
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,7 @@
#include <utils/eoState.h> #include <utils/eoState.h>
#include <moeoArchive.h> #include <moeoArchive.h>
#include <moeoComparator.h> #include <moeoComparator.h>
#include <moeoCrowdingDiversityAssignment.h> #include <moeoCrowdingDistanceDiversityAssignment.h>
#include <moeoDetTournamentSelect.h> #include <moeoDetTournamentSelect.h>
#include <moeoDiversityAssignment.h> #include <moeoDiversityAssignment.h>
#include <moeoEA.h> #include <moeoEA.h>
@ -107,11 +107,11 @@ moeoEA < MOEOT > & do_make_ea_moeo(eoParser & _parser, eoState & _state, eoEvalF
/* the diversity assignment strategy */ /* the diversity assignment strategy */
string & diversityParam = _parser.createParam(string("Dummy"), "diversity", string & diversityParam = _parser.createParam(string("Dummy"), "diversity",
"Diversity assignment scheme: Dummy or Crowding", 'D', "Evolution Engine").value(); "Diversity assignment scheme: Dummy or CrowdingDistance", 'D', "Evolution Engine").value();
moeoDiversityAssignment < MOEOT > * diversityAssignment; moeoDiversityAssignment < MOEOT > * diversityAssignment;
if (diversityParam == string("Crowding")) if (diversityParam == string("CrowdingDistance"))
{ {
diversityAssignment = new moeoCrowdingDiversityAssignment < MOEOT> (); diversityAssignment = new moeoCrowdingDistanceDiversityAssignment < MOEOT> ();
} }
else if (diversityParam == string("Dummy")) else if (diversityParam == string("Dummy"))
{ {
@ -164,7 +164,7 @@ moeoEA < MOEOT > & do_make_ea_moeo(eoParser & _parser, eoState & _state, eoEvalF
{ {
tSize = atoi(ppSelect.second[0].c_str()); tSize = atoi(ppSelect.second[0].c_str());
} }
select = new moeoDetTournamentSelect < MOEOT > (*fitnessAssignment, *diversityAssignment, *comparator, tSize); select = new moeoDetTournamentSelect < MOEOT > (*comparator, tSize);
} }
else if (ppSelect.first == string("StochTour")) else if (ppSelect.first == string("StochTour"))
{ {
@ -180,7 +180,7 @@ moeoEA < MOEOT > & do_make_ea_moeo(eoParser & _parser, eoState & _state, eoEvalF
{ {
tRate = atof(ppSelect.second[0].c_str()); tRate = atof(ppSelect.second[0].c_str());
} }
select = new moeoStochTournamentSelect < MOEOT > (*fitnessAssignment, *diversityAssignment, *comparator, tRate); select = new moeoStochTournamentSelect < MOEOT > (*comparator, tRate);
} }
else if (ppSelect.first == string("Roulette")) else if (ppSelect.first == string("Roulette"))
{ {