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

update with new stuffs

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@495 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
liefooga 2007-07-02 13:58:15 +00:00
commit 4ed6c756ea
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
trunk/paradiseo-moeo/src/do/make_ea_moeo.h
View file

@ -30,12 +30,12 @@
#include <comparator/moeoFitnessThenDiversityComparator.h> #include <comparator/moeoFitnessThenDiversityComparator.h>
#include <diversity/moeoDiversityAssignment.h> #include <diversity/moeoDiversityAssignment.h>
#include <diversity/moeoDummyDiversityAssignment.h> #include <diversity/moeoDummyDiversityAssignment.h>
#include <diversity/moeoFrontByFrontCrowdingDistanceDiversityAssignment.h> #include <diversity/moeoFrontByFrontCrowdingDiversityAssignment.h>
#include <diversity/moeoFrontByFrontSharingDiversityAssignment.h> #include <diversity/moeoFrontByFrontSharingDiversityAssignment.h>
#include <fitness/moeoFastNonDominatedSortingFitnessAssignment.h>
#include <fitness/moeoDummyFitnessAssignment.h> #include <fitness/moeoDummyFitnessAssignment.h>
#include <fitness/moeoExpBinaryIndicatorBasedFitnessAssignment.h>
#include <fitness/moeoFastNonDominatedSortingFitnessAssignment.h>
#include <fitness/moeoFitnessAssignment.h> #include <fitness/moeoFitnessAssignment.h>
#include <fitness/moeoIndicatorBasedFitnessAssignment.h>
#include <metric/moeoAdditiveEpsilonBinaryMetric.h> #include <metric/moeoAdditiveEpsilonBinaryMetric.h>
#include <metric/moeoHypervolumeBinaryMetric.h> #include <metric/moeoHypervolumeBinaryMetric.h>
#include <metric/moeoNormalizedSolutionVsSolutionBinaryMetric.h> #include <metric/moeoNormalizedSolutionVsSolutionBinaryMetric.h>
@ -104,7 +104,7 @@ moeoEA < MOEOT > & do_make_ea_moeo(eoParser & _parser, eoState & _state, eoEvalF
std::string stmp = std::string("Invalid binary quality indicator: ") + indicatorParam; std::string stmp = std::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 moeoExpBinaryIndicatorBasedFitnessAssignment < MOEOT > (*metric, kappa);
} }
else else
{ {
@ -140,7 +140,7 @@ moeoEA < MOEOT > & do_make_ea_moeo(eoParser & _parser, eoState & _state, eoEvalF
} }
else if (diversityParamValue.first == std::string("Crowding")) else if (diversityParamValue.first == std::string("Crowding"))
{ {
diversityAssignment = new moeoFrontByFrontCrowdingDistanceDiversityAssignment < MOEOT> (); diversityAssignment = new moeoFrontByFrontCrowdingDiversityAssignment < MOEOT> ();
} }
else else
{ {