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

from moeoFastNonDominantedSortingFitnessAssignment to moeoDominanceDepthFitnessAssignment

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1269 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
liefooga 2008-11-27 14:33:11 +00:00
commit b32c1704e8
9 changed files with 34 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/paradiseo-moeo/test/CMakeLists.txt
View file

@ -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

12
trunk/paradiseo-moeo/test/t-moeoFastNonDominatedSortingFitnessAssignment.cpp → trunk/paradiseo-moeo/test/t-moeoDominanceDepthFitnessAssignment.cpp
View file

@ -1,7 +1,7 @@
/*
* <t-moeoFastNonDominatedSortingFitnessAssignment.cpp>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
* (C) OPAC Team, LIFL, 2002-2007
* <t-moeoDominanceDepthFitnessAssignment.cpp>
* 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 <eo>
@ -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]

2
trunk/paradiseo-moeo/test/t-moeoEasyEA.cpp
View file

@ -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);