From b32c1704e8dd807e7782780569c0e8d7c558ea28 Mon Sep 17 00:00:00 2001 From: liefooga Date: Thu, 27 Nov 2008 14:33:11 +0000 Subject: [PATCH] from moeoFastNonDominantedSortingFitnessAssignment to moeoDominanceDepthFitnessAssignment git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1269 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/paradiseo-moeo/src/algo/moeoNSGA.h | 8 ++++---- trunk/paradiseo-moeo/src/algo/moeoNSGAII.h | 10 +++++----- trunk/paradiseo-moeo/src/do/make_ea_moeo.h | 10 +++++----- ... => moeoDominanceDepthFitnessAssignment.h} | 20 +++++++++---------- trunk/paradiseo-moeo/src/moeo | 2 +- trunk/paradiseo-moeo/test/CMakeLists.txt | 2 +- ...t-moeoDominanceDepthFitnessAssignment.cpp} | 12 +++++------ trunk/paradiseo-moeo/test/t-moeoEasyEA.cpp | 2 +- .../tutorial/Lesson2/FlowShopEA.cpp | 10 +--------- 9 files changed, 34 insertions(+), 42 deletions(-) rename trunk/paradiseo-moeo/src/fitness/{moeoFastNonDominatedSortingFitnessAssignment.h => moeoDominanceDepthFitnessAssignment.h} (93%) rename trunk/paradiseo-moeo/test/{t-moeoFastNonDominatedSortingFitnessAssignment.cpp => t-moeoDominanceDepthFitnessAssignment.cpp} (92%) diff --git a/trunk/paradiseo-moeo/src/algo/moeoNSGA.h b/trunk/paradiseo-moeo/src/algo/moeoNSGA.h index 8ca918ecf..1db0b0f14 100644 --- a/trunk/paradiseo-moeo/src/algo/moeoNSGA.h +++ b/trunk/paradiseo-moeo/src/algo/moeoNSGA.h @@ -1,7 +1,7 @@ /* * -* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 -* (C) OPAC Team, LIFL, 2002-2007 +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008 +* (C) OPAC Team, LIFL, 2002-2008 * * Arnaud Liefooghe * @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include @@ -204,7 +204,7 @@ protected: /** breeder */ eoBreed < MOEOT > & breed; /** fitness assignment used in NSGA-II */ - moeoFastNonDominatedSortingFitnessAssignment < MOEOT > fitnessAssignment; + moeoDominanceDepthFitnessAssignment < MOEOT > fitnessAssignment; /** diversity assignment used in NSGA-II */ moeoFrontByFrontSharingDiversityAssignment < MOEOT > diversityAssignment; /** elitist replacement */ diff --git a/trunk/paradiseo-moeo/src/algo/moeoNSGAII.h b/trunk/paradiseo-moeo/src/algo/moeoNSGAII.h index 587760e1a..137592865 100644 --- a/trunk/paradiseo-moeo/src/algo/moeoNSGAII.h +++ b/trunk/paradiseo-moeo/src/algo/moeoNSGAII.h @@ -1,7 +1,7 @@ /* * -* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 -* (C) OPAC Team, LIFL, 2002-2007 +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008 +* (C) OPAC Team, LIFL, 2002-2008 * * Arnaud Liefooghe * @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include @@ -198,8 +198,8 @@ protected: eoGeneralBreeder < MOEOT > genBreed; /** breeder */ eoBreed < MOEOT > & breed; - /** fitness assignment used in NSGA-II */ - moeoFastNonDominatedSortingFitnessAssignment < MOEOT > fitnessAssignment; + /** fitness assignment used in NSGA */ + moeoDominanceDepthFitnessAssignment < MOEOT > fitnessAssignment; /** diversity assignment used in NSGA-II */ moeoFrontByFrontCrowdingDiversityAssignment < MOEOT > diversityAssignment; /** elitist replacement */ diff --git a/trunk/paradiseo-moeo/src/do/make_ea_moeo.h b/trunk/paradiseo-moeo/src/do/make_ea_moeo.h index 6f98101ab..aa5a38ad9 100755 --- a/trunk/paradiseo-moeo/src/do/make_ea_moeo.h +++ b/trunk/paradiseo-moeo/src/do/make_ea_moeo.h @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include #include @@ -93,8 +93,8 @@ moeoEA < MOEOT > & do_make_ea_moeo(eoParser & _parser, eoState & _state, eoEvalF /* the fitness assignment strategy */ - std::string & fitnessParam = _parser.createParam(std::string("FastNonDominatedSorting"), "fitness", - "Fitness assignment scheme: Dummy, FastNonDominatedSorting or IndicatorBased", 'F', + std::string & fitnessParam = _parser.createParam(std::string("DomDepth"), "fitness", + "Fitness assignment scheme: Dummy, DomDepth or IndicatorBased", 'F', "Evolution Engine").value(); std::string & indicatorParam = _parser.createParam(std::string("Epsilon"), "indicator", "Binary indicator for IndicatorBased: Epsilon, Hypervolume", 'i', @@ -108,9 +108,9 @@ moeoEA < MOEOT > & do_make_ea_moeo(eoParser & _parser, eoState & _state, eoEvalF { fitnessAssignment = new moeoDummyFitnessAssignment < MOEOT> (); } - else if (fitnessParam == std::string("FastNonDominatedSorting")) + else if (fitnessParam == std::string("DomDepth")) { - fitnessAssignment = new moeoFastNonDominatedSortingFitnessAssignment < MOEOT> (); + fitnessAssignment = new moeoDominanceDepthFitnessAssignment < MOEOT> (); } else if (fitnessParam == std::string("IndicatorBased")) { diff --git a/trunk/paradiseo-moeo/src/fitness/moeoFastNonDominatedSortingFitnessAssignment.h b/trunk/paradiseo-moeo/src/fitness/moeoDominanceDepthFitnessAssignment.h similarity index 93% rename from trunk/paradiseo-moeo/src/fitness/moeoFastNonDominatedSortingFitnessAssignment.h rename to trunk/paradiseo-moeo/src/fitness/moeoDominanceDepthFitnessAssignment.h index dd157b880..bd0193251 100644 --- a/trunk/paradiseo-moeo/src/fitness/moeoFastNonDominatedSortingFitnessAssignment.h +++ b/trunk/paradiseo-moeo/src/fitness/moeoDominanceDepthFitnessAssignment.h @@ -1,7 +1,7 @@ /* -* -* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 -* (C) OPAC Team, LIFL, 2002-2007 +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008 +* (C) OPAC Team, LIFL, 2002-2008 * * Arnaud Liefooghe * @@ -35,8 +35,8 @@ */ //----------------------------------------------------------------------------- -#ifndef MOEOFASTNONDOMINATEDSORTINGFITNESSASSIGNMENT_H_ -#define MOEOFASTNONDOMINATEDSORTINGFITNESSASSIGNMENT_H_ +#ifndef MOEODOMINANCEDEPTHFITNESSASSIGNMENT_H_ +#define MOEODOMINANCEDEPTHFITNESSASSIGNMENT_H_ #include #include @@ -54,7 +54,7 @@ * This strategy is, for instance, used in NSGA and NSGA-II. */ template < class MOEOT > -class moeoFastNonDominatedSortingFitnessAssignment : public moeoDominanceBasedFitnessAssignment < MOEOT > +class moeoDominanceDepthFitnessAssignment : public moeoDominanceBasedFitnessAssignment < MOEOT > { public: @@ -65,7 +65,7 @@ class moeoFastNonDominatedSortingFitnessAssignment : public moeoDominanceBasedFi /** * Default ctor */ - moeoFastNonDominatedSortingFitnessAssignment() : comparator(paretoComparator) + moeoDominanceDepthFitnessAssignment() : comparator(paretoComparator) {} @@ -73,7 +73,7 @@ class moeoFastNonDominatedSortingFitnessAssignment : public moeoDominanceBasedFi * Ctor where you can choose your own way to compare objective vectors * @param _comparator the functor used to compare objective vectors */ - moeoFastNonDominatedSortingFitnessAssignment(moeoObjectiveVectorComparator < ObjectiveVector > & _comparator) : comparator(_comparator) + moeoDominanceDepthFitnessAssignment(moeoObjectiveVectorComparator < ObjectiveVector > & _comparator) : comparator(_comparator) {} @@ -260,6 +260,6 @@ class moeoFastNonDominatedSortingFitnessAssignment : public moeoDominanceBasedFi } } - }; + } ; -#endif /*MOEOFASTNONDOMINATEDSORTINGFITNESSASSIGNMENT_H_*/ +#endif /*MOEODOMINANCEDEPTHFITNESSASSIGNMENT_H_*/ diff --git a/trunk/paradiseo-moeo/src/moeo b/trunk/paradiseo-moeo/src/moeo index 1a45e20b4..6a12ce121 100644 --- a/trunk/paradiseo-moeo/src/moeo +++ b/trunk/paradiseo-moeo/src/moeo @@ -102,10 +102,10 @@ #include #include #include +#include #include #include #include -#include #include #include #include diff --git a/trunk/paradiseo-moeo/test/CMakeLists.txt b/trunk/paradiseo-moeo/test/CMakeLists.txt index b7bef8a6b..4ed526941 100644 --- a/trunk/paradiseo-moeo/test/CMakeLists.txt +++ b/trunk/paradiseo-moeo/test/CMakeLists.txt @@ -44,7 +44,6 @@ SET (TEST_LIST t-moeoFitnessThenDiversityComparator t-moeoAchievementFitnessAssignment t-moeoExpBinaryIndicatorBasedFitnessAssignment - t-moeoFastNonDominatedSortingFitnessAssignment t-moeoCrowdingDiversityAssignment t-moeoSharingDiversityAssignment t-moeoIBEA @@ -56,6 +55,7 @@ SET (TEST_LIST t-moeoDominanceCountFitnessAssignment t-moeoDominanceRankFitnessAssignment t-moeoDominanceCountRankingFitnessAssignment + t-moeoDominanceDepthFitnessAssignment t-moeoNearestNeighborDiversityAssignment t-moeoSPEA2Archive t-moeoSPEA2 diff --git a/trunk/paradiseo-moeo/test/t-moeoFastNonDominatedSortingFitnessAssignment.cpp b/trunk/paradiseo-moeo/test/t-moeoDominanceDepthFitnessAssignment.cpp similarity index 92% rename from trunk/paradiseo-moeo/test/t-moeoFastNonDominatedSortingFitnessAssignment.cpp rename to trunk/paradiseo-moeo/test/t-moeoDominanceDepthFitnessAssignment.cpp index 4baa0c8b0..58a636769 100644 --- a/trunk/paradiseo-moeo/test/t-moeoFastNonDominatedSortingFitnessAssignment.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoDominanceDepthFitnessAssignment.cpp @@ -1,7 +1,7 @@ /* -* -* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 -* (C) OPAC Team, LIFL, 2002-2007 +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008 +* (C) OPAC Team, LIFL, 2002-2008 * * Arnaud Liefooghe * @@ -34,7 +34,7 @@ * */ //----------------------------------------------------------------------------- -// t-moeoFastNonDominatedSortingFitnessAssignment.cpp +// t-moeoDominanceDepthFitnessAssignment.cpp //----------------------------------------------------------------------------- #include @@ -67,7 +67,7 @@ typedef MOEO < ObjectiveVector, double, double > Solution; int main() { - std::cout << "[moeoFastNonDominatedSortingFitnessAssignment]\t=>\t"; + std::cout << "[moeoDominanceDepthFitnessAssignment]\t=>\t"; // objective vectors ObjectiveVector obj0, obj1, obj2, obj3, obj4, obj5; @@ -95,7 +95,7 @@ int main() pop[5].objectiveVector(obj5); // class 1 // fitness assignment - moeoFastNonDominatedSortingFitnessAssignment< Solution > fitnessAssignment; + moeoDominanceDepthFitnessAssignment< Solution > fitnessAssignment; fitnessAssignment(pop); // pop[0] diff --git a/trunk/paradiseo-moeo/test/t-moeoEasyEA.cpp b/trunk/paradiseo-moeo/test/t-moeoEasyEA.cpp index 1f917251e..b378f9f9a 100644 --- a/trunk/paradiseo-moeo/test/t-moeoEasyEA.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoEasyEA.cpp @@ -100,7 +100,7 @@ int main() eoRealInitBounded < Solution > init(bounds); eoPop < Solution > pop(20, init); eoGenContinue < Solution > term(20); - moeoFastNonDominatedSortingFitnessAssignment < Solution > fitnessAssignment; + moeoDominanceDepthFitnessAssignment < Solution > fitnessAssignment; moeoFrontByFrontCrowdingDiversityAssignment < Solution > diversityAssignment; moeoFitnessThenDiversityComparator < Solution > comparator; moeoDetTournamentSelect < Solution > selectOne(comparator, 2); diff --git a/trunk/paradiseo-moeo/tutorial/Lesson2/FlowShopEA.cpp b/trunk/paradiseo-moeo/tutorial/Lesson2/FlowShopEA.cpp index af267f778..4f7a28913 100644 --- a/trunk/paradiseo-moeo/tutorial/Lesson2/FlowShopEA.cpp +++ b/trunk/paradiseo-moeo/tutorial/Lesson2/FlowShopEA.cpp @@ -46,14 +46,6 @@ #include // how to initialize the population #include -// the stopping criterion -#include -// outputs (stats, population dumps, ...) -#include -// evolution engine (selection and replacement) -#include -// simple call to the algo -#include // checks for help demand, and writes the status file and make_help; in libutils void make_help(eoParser & _parser); // definition of the representation @@ -96,7 +88,7 @@ int main(int argc, char* argv[]) moeoArchiveUpdater < FlowShop > updater(arch, pop); checkpoint.add(updater); // fitness assignment - moeoFastNonDominatedSortingFitnessAssignment fitnessAssignment; + moeoDominanceDepthFitnessAssignment fitnessAssignment; // diversity preservation moeoFrontByFrontCrowdingDiversityAssignment diversityAssignment; // comparator