From afa6195c6ad68668d839af2cc5f7689cea2237e0 Mon Sep 17 00:00:00 2001 From: liefooga Date: Mon, 2 Jul 2007 13:52:30 +0000 Subject: [PATCH] change 'crowding distance' to 'crowding' git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@491 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/paradiseo-moeo/src/algo/moeoNSGAII.h | 4 ++-- ...ent.h => moeoCrowdingDiversityAssignment.h} | 12 ++++++------ ...oFrontByFrontCrowdingDiversityAssignment.h} | 18 +++++++++--------- 3 files changed, 17 insertions(+), 17 deletions(-) rename trunk/paradiseo-moeo/src/diversity/{moeoCrowdingDistanceDiversityAssignment.h => moeoCrowdingDiversityAssignment.h} (90%) mode change 100755 => 100644 rename trunk/paradiseo-moeo/src/diversity/{moeoFrontByFrontCrowdingDistanceDiversityAssignment.h => moeoFrontByFrontCrowdingDiversityAssignment.h} (87%) diff --git a/trunk/paradiseo-moeo/src/algo/moeoNSGAII.h b/trunk/paradiseo-moeo/src/algo/moeoNSGAII.h index 0c27bfd15..60854860f 100644 --- a/trunk/paradiseo-moeo/src/algo/moeoNSGAII.h +++ b/trunk/paradiseo-moeo/src/algo/moeoNSGAII.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include @@ -138,7 +138,7 @@ protected: /** fitness assignment used in NSGA-II */ moeoFastNonDominatedSortingFitnessAssignment < MOEOT > fitnessAssignment; /** diversity assignment used in NSGA-II */ - moeoFrontByFrontCrowdingDistanceDiversityAssignment < MOEOT > diversityAssignment; + moeoFrontByFrontCrowdingDiversityAssignment < MOEOT > diversityAssignment; /** elitist replacement */ moeoElitistReplacement < MOEOT > replace; /** an object for genetic operators (used as default) */ diff --git a/trunk/paradiseo-moeo/src/diversity/moeoCrowdingDistanceDiversityAssignment.h b/trunk/paradiseo-moeo/src/diversity/moeoCrowdingDiversityAssignment.h old mode 100755 new mode 100644 similarity index 90% rename from trunk/paradiseo-moeo/src/diversity/moeoCrowdingDistanceDiversityAssignment.h rename to trunk/paradiseo-moeo/src/diversity/moeoCrowdingDiversityAssignment.h index bece3da4f..ff45ac0c2 --- a/trunk/paradiseo-moeo/src/diversity/moeoCrowdingDistanceDiversityAssignment.h +++ b/trunk/paradiseo-moeo/src/diversity/moeoCrowdingDiversityAssignment.h @@ -1,7 +1,7 @@ // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- //----------------------------------------------------------------------------- -// moeoCrowdingDistanceDiversityAssignment.h +// moeoCrowdingDiversityAssignment.h // (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2007 /* This library... @@ -10,19 +10,19 @@ */ //----------------------------------------------------------------------------- -#ifndef MOEOCROWDINGDISTANCEDIVERSITYASSIGNMENT_H_ -#define MOEOCROWDINGDISTANCEDIVERSITYASSIGNMENT_H_ +#ifndef MOEOCROWDINGDIVERSITYASSIGNMENT_H_ +#define MOEOCROWDINGDIVERSITYASSIGNMENT_H_ #include #include #include /** - * Diversity assignment sheme based on crowding distance proposed in: + * Diversity assignment sheme based on crowding proposed in: * K. Deb, A. Pratap, S. Agarwal, T. Meyarivan, "A Fast and Elitist Multi-Objective Genetic Algorithm: NSGA-II", IEEE Transactions on Evolutionary Computation, vol. 6, no. 2 (2002). */ template < class MOEOT > -class moeoCrowdingDistanceDiversityAssignment : public moeoDiversityAssignment < MOEOT > +class moeoCrowdingDiversityAssignment : public moeoDiversityAssignment < MOEOT > { public: @@ -119,4 +119,4 @@ protected: }; -#endif /*MOEOCROWDINGDISTANCEDIVERSITYASSIGNMENT_H_*/ +#endif /*MOEOCROWDINGDIVERSITYASSIGNMENT_H_*/ diff --git a/trunk/paradiseo-moeo/src/diversity/moeoFrontByFrontCrowdingDistanceDiversityAssignment.h b/trunk/paradiseo-moeo/src/diversity/moeoFrontByFrontCrowdingDiversityAssignment.h similarity index 87% rename from trunk/paradiseo-moeo/src/diversity/moeoFrontByFrontCrowdingDistanceDiversityAssignment.h rename to trunk/paradiseo-moeo/src/diversity/moeoFrontByFrontCrowdingDiversityAssignment.h index b4d35ac6e..9b2d37a2c 100644 --- a/trunk/paradiseo-moeo/src/diversity/moeoFrontByFrontCrowdingDistanceDiversityAssignment.h +++ b/trunk/paradiseo-moeo/src/diversity/moeoFrontByFrontCrowdingDiversityAssignment.h @@ -1,7 +1,7 @@ // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- //----------------------------------------------------------------------------- -// moeoFrontByFrontCrowdingDistanceDiversityAssignment.h +// moeoFrontByFrontCrowdingDiversityAssignment.h // (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2007 /* This library... @@ -10,19 +10,19 @@ */ //----------------------------------------------------------------------------- -#ifndef MOEOFRONTBYFRONTCROWDINGDISTANCEDIVERSITYASSIGNMENT_H_ -#define MOEOFRONTBYFRONTCROWDINGDISTANCEDIVERSITYASSIGNMENT_H_ +#ifndef MOEOFRONTBYFRONTCROWDINGDIVERSITYASSIGNMENT_H_ +#define MOEOFRONTBYFRONTCROWDINGDIVERSITYASSIGNMENT_H_ -#include +#include #include /** - * Diversity assignment sheme based on crowding distance proposed in: + * Diversity assignment sheme based on crowding proposed in: * K. Deb, A. Pratap, S. Agarwal, T. Meyarivan, "A Fast and Elitist Multi-Objective Genetic Algorithm: NSGA-II", IEEE Transactions on Evolutionary Computation, vol. 6, no. 2 (2002). * Tis strategy assigns diversity values FRONT BY FRONT. It is, for instance, used in NSGA-II. */ template < class MOEOT > -class moeoFrontByFrontCrowdingDistanceDiversityAssignment : public moeoCrowdingDistanceDiversityAssignment < MOEOT > +class moeoFrontByFrontCrowdingDiversityAssignment : public moeoCrowdingDiversityAssignment < MOEOT > { public: @@ -45,8 +45,8 @@ public: private: - using moeoCrowdingDistanceDiversityAssignment < MOEOT >::inf; - using moeoCrowdingDistanceDiversityAssignment < MOEOT >::tiny; + using moeoCrowdingDiversityAssignment < MOEOT >::inf; + using moeoCrowdingDiversityAssignment < MOEOT >::tiny; /** * Sets the distance values @@ -130,4 +130,4 @@ private: }; -#endif /*MOEOFRONTBYFRONTCROWDINGDISTANCEDIVERSITYASSIGNMENT_H_*/ +#endif /*MOEOFRONTBYFRONTCROWDINGDIVERSITYASSIGNMENT_H_*/