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

Typo in moeo comments.

Browse source
This commit is contained in:
manu 2014-05-01 19:21:43 +02:00 • committed by quemy
commit 1f09aa656f
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
moeo/src/algo/moeoSPEA2.h
View file

@ -255,7 +255,7 @@ protected:
eoQuadCloneOp < MOEOT > defaultQuadOp; eoQuadCloneOp < MOEOT > defaultQuadOp;
/** an object for genetic operators (used as default) */ /** an object for genetic operators (used as default) */
eoSGAGenOp < MOEOT > defaultSGAGenOp; eoSGAGenOp < MOEOT > defaultSGAGenOp;
/** fitness assignment used in NSGA-II */ /** fitness assignment used in SPEA2 */
moeoDominanceCountRankingFitnessAssignment < MOEOT > fitnessAssignment; moeoDominanceCountRankingFitnessAssignment < MOEOT > fitnessAssignment;
/** general breeder */ /** general breeder */
eoGeneralBreeder < MOEOT > genBreed; eoGeneralBreeder < MOEOT > genBreed;
@ -265,7 +265,7 @@ protected:
eoSelectTransform <MOEOT> selectTransform; eoSelectTransform <MOEOT> selectTransform;
/** breeder */ /** breeder */
eoBreed < MOEOT > & breed; eoBreed < MOEOT > & breed;
/** diversity assignment used in NSGA-II */ /** diversity assignment used in SPEA2 */
moeoNearestNeighborDiversityAssignment < MOEOT > diversityAssignment; moeoNearestNeighborDiversityAssignment < MOEOT > diversityAssignment;
/** elitist replacement */ /** elitist replacement */
moeoGenerationalReplacement < MOEOT > replace; moeoGenerationalReplacement < MOEOT > replace;

4
moeo/src/diversity/moeoFrontByFrontCrowdingDiversityAssignment.h
View file

@ -44,9 +44,9 @@
/** /**
* Diversity assignment sheme based on crowding proposed in: * Diversity assignment scheme 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. * This strategy assigns diversity values FRONT BY FRONT. It is, for instance, used in NSGA-II.
*/ */
template < class MOEOT > template < class MOEOT >
class moeoFrontByFrontCrowdingDiversityAssignment : public moeoCrowdingDiversityAssignment < MOEOT > class moeoFrontByFrontCrowdingDiversityAssignment : public moeoCrowdingDiversityAssignment < MOEOT >

9
moeo/src/diversity/moeoNearestNeighborDiversityAssignment.h
View file

@ -46,7 +46,14 @@
#include <archive/moeoArchive.h> #include <archive/moeoArchive.h>
/** /**
* moeoNearestNeighborDiversityAssignment is a moeoDiversityAssignment using distance between individuals to assign diversity. * moeoNearestNeighborDiversityAssignment is a moeoDiversityAssignment
* using distance between individuals to assign diversity. Proposed in:
* E. Zitzler, M. Laumanns, and L. Thiele. SPEA2: Improving the
* Strength Pareto Evolutionary Algorithm. Technical Report 103,
* Computer Engineering and Networks Laboratory (TIK), ETH Zurich,
* Zurich, Switzerland, 2001.
* It is used in moeoSPEA2.
*/ */
template < class MOEOT > template < class MOEOT >
class moeoNearestNeighborDiversityAssignment : public moeoDiversityAssignment < MOEOT > class moeoNearestNeighborDiversityAssignment : public moeoDiversityAssignment < MOEOT >