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

change 'crowding distance' to 'crowding'

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@491 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
liefooga 2007-07-02 13:52:30 +00:00
commit afa6195c6a
3 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/paradiseo-moeo/src/algo/moeoNSGAII.h
View file

@ -22,7 +22,7 @@
#include <eoPopEvalFunc.h> #include <eoPopEvalFunc.h>
#include <eoSGAGenOp.h> #include <eoSGAGenOp.h>
#include <algo/moeoEA.h> #include <algo/moeoEA.h>
#include <diversity/moeoFrontByFrontCrowdingDistanceDiversityAssignment.h> #include <diversity/moeoFrontByFrontCrowdingDiversityAssignment.h>
#include <fitness/moeoFastNonDominatedSortingFitnessAssignment.h> #include <fitness/moeoFastNonDominatedSortingFitnessAssignment.h>
#include <replacement/moeoElitistReplacement.h> #include <replacement/moeoElitistReplacement.h>
#include <selection/moeoDetTournamentSelect.h> #include <selection/moeoDetTournamentSelect.h>
@ -138,7 +138,7 @@ protected:
/** fitness assignment used in NSGA-II */ /** fitness assignment used in NSGA-II */
moeoFastNonDominatedSortingFitnessAssignment < MOEOT > fitnessAssignment; moeoFastNonDominatedSortingFitnessAssignment < MOEOT > fitnessAssignment;
/** diversity assignment used in NSGA-II */ /** diversity assignment used in NSGA-II */
moeoFrontByFrontCrowdingDistanceDiversityAssignment < MOEOT > diversityAssignment; moeoFrontByFrontCrowdingDiversityAssignment < MOEOT > diversityAssignment;
/** elitist replacement */ /** elitist replacement */
moeoElitistReplacement < MOEOT > replace; moeoElitistReplacement < MOEOT > replace;
/** an object for genetic operators (used as default) */ /** an object for genetic operators (used as default) */

12
trunk/paradiseo-moeo/src/diversity/moeoCrowdingDistanceDiversityAssignment.h → trunk/paradiseo-moeo/src/diversity/moeoCrowdingDiversityAssignment.h Executable file → Normal file
View file

@ -1,7 +1,7 @@
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- // -*- 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 // (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2007
/* /*
This library... This library...
@ -10,19 +10,19 @@
*/ */
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef MOEOCROWDINGDISTANCEDIVERSITYASSIGNMENT_H_ #ifndef MOEOCROWDINGDIVERSITYASSIGNMENT_H_
#define MOEOCROWDINGDISTANCEDIVERSITYASSIGNMENT_H_ #define MOEOCROWDINGDIVERSITYASSIGNMENT_H_
#include <eoPop.h> #include <eoPop.h>
#include <comparator/moeoOneObjectiveComparator.h> #include <comparator/moeoOneObjectiveComparator.h>
#include <diversity/moeoDiversityAssignment.h> #include <diversity/moeoDiversityAssignment.h>
/** /**
* 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). * 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 > template < class MOEOT >
class moeoCrowdingDistanceDiversityAssignment : public moeoDiversityAssignment < MOEOT > class moeoCrowdingDiversityAssignment : public moeoDiversityAssignment < MOEOT >
{ {
public: public:
@ -119,4 +119,4 @@ protected:
}; };
#endif /*MOEOCROWDINGDISTANCEDIVERSITYASSIGNMENT_H_*/ #endif /*MOEOCROWDINGDIVERSITYASSIGNMENT_H_*/

18
trunk/paradiseo-moeo/src/diversity/moeoFrontByFrontCrowdingDistanceDiversityAssignment.h → trunk/paradiseo-moeo/src/diversity/moeoFrontByFrontCrowdingDiversityAssignment.h
View file

@ -1,7 +1,7 @@
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- // -*- 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 // (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2007
/* /*
This library... This library...
@ -10,19 +10,19 @@
*/ */
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef MOEOFRONTBYFRONTCROWDINGDISTANCEDIVERSITYASSIGNMENT_H_ #ifndef MOEOFRONTBYFRONTCROWDINGDIVERSITYASSIGNMENT_H_
#define MOEOFRONTBYFRONTCROWDINGDISTANCEDIVERSITYASSIGNMENT_H_ #define MOEOFRONTBYFRONTCROWDINGDIVERSITYASSIGNMENT_H_
#include <diversity/moeoCrowdingDistanceDiversityAssignment.h> #include <diversity/moeoCrowdingDiversityAssignment.h>
#include <comparator/moeoFitnessThenDiversityComparator.h> #include <comparator/moeoFitnessThenDiversityComparator.h>
/** /**
* 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). * 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. * Tis strategy assigns diversity values FRONT BY FRONT. It is, for instance, used in NSGA-II.
*/ */
template < class MOEOT > template < class MOEOT >
class moeoFrontByFrontCrowdingDistanceDiversityAssignment : public moeoCrowdingDistanceDiversityAssignment < MOEOT > class moeoFrontByFrontCrowdingDiversityAssignment : public moeoCrowdingDiversityAssignment < MOEOT >
{ {
public: public:
@ -45,8 +45,8 @@ public:
private: private:
using moeoCrowdingDistanceDiversityAssignment < MOEOT >::inf; using moeoCrowdingDiversityAssignment < MOEOT >::inf;
using moeoCrowdingDistanceDiversityAssignment < MOEOT >::tiny; using moeoCrowdingDiversityAssignment < MOEOT >::tiny;
/** /**
* Sets the distance values * Sets the distance values
@ -130,4 +130,4 @@ private:
}; };
#endif /*MOEOFRONTBYFRONTCROWDINGDISTANCEDIVERSITYASSIGNMENT_H_*/ #endif /*MOEOFRONTBYFRONTCROWDINGDIVERSITYASSIGNMENT_H_*/