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

merge ParadisEO-MOEO v-1.0

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@403 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
liefooga 2007-06-26 13:34:24 +00:00
commit 0819460cf5
1 changed files with 0 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,25 +20,6 @@
#include <eoGenOp.h>
#include <utils/eoParser.h>
#include <utils/eoState.h>
<<<<<<< .courant
#include <moeoArchive.h>
#include <moeoComparator.h>
#include <moeoCrowdingDistanceDiversityAssignment.h>
#include <moeoDetTournamentSelect.h>
#include <moeoDiversityAssignment.h>
#include <moeoEA.h>
#include <moeoEasyEA.h>
#include <moeoElitistReplacement.h>
#include <moeoEnvironmentalReplacement.h>
#include <moeoFastNonDominatedSortingFitnessAssignment.h>
#include <moeoFitnessAssignment.h>
#include <moeoGenerationalReplacement.h>
#include <moeoIndicatorBasedFitnessAssignment.h>
#include <moeoRandomSelect.h>
#include <moeoReplacement.h>
#include <moeoSelectOne.h>
#include <moeoStochTournamentSelect.h>
=======
#include <algo/moeoEA.h>
#include <algo/moeoEasyEA.h>
@ -57,7 +38,6 @@
#include <fitness/moeoIndicatorBasedFitnessAssignment.h>
#include <metric/moeoAdditiveEpsilonBinaryMetric.h>
#include <metric/moeoHypervolumeBinaryMetric.h>
>>>>>>> .fusion-droit.r399
#include <metric/moeoNormalizedSolutionVsSolutionBinaryMetric.h>
#include <replacement/moeoElitistReplacement.h>
#include <replacement/moeoEnvironmentalReplacement.h>