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

from moeoParetoBasedFitnessAssignment to moeoDominanceBasedFitnessAssignment

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

18
trunk/paradiseo-moeo/src/fitness/moeoParetoBasedFitnessAssignment.h → trunk/paradiseo-moeo/src/fitness/moeoDominanceBasedFitnessAssignment.h
View file

@ -1,7 +1,7 @@
/* /*
* <moeoParetoBasedFitnessAssignment.h> * <moeoDominanceBasedFitnessAssignment.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
* (C) OPAC Team, LIFL, 2002-2007 * (C) OPAC Team, LIFL, 2002-2008
* *
* Arnaud Liefooghe * Arnaud Liefooghe
* *
@ -35,16 +35,16 @@
*/ */
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef MOEOPARETOBASEDFITNESSASSIGNMENT_H_ #ifndef MOEODOMINANCEBASEDFITNESSASSIGNMENT_H_
#define MOEOPARETOBASEDFITNESSASSIGNMENT_H_ #define MOEODOMINANCEBASEDFITNESSASSIGNMENT_H_
#include <fitness/moeoFitnessAssignment.h> #include <fitness/moeoFitnessAssignment.h>
/** /**
* moeoParetoBasedFitnessAssignment is a moeoFitnessAssignment for Pareto-based strategies. * moeoDominanceBasedFitnessAssignment is a moeoFitnessAssignment for dominance-based strategies.
*/ */
template < class MOEOT > template < class MOEOT >
class moeoParetoBasedFitnessAssignment : public moeoFitnessAssignment < MOEOT > class moeoDominanceBasedFitnessAssignment : public moeoFitnessAssignment < MOEOT >
{}; {};
#endif /*MOEOPARETOBASEDFITNESSASSIGNMENT_H_*/ #endif /*MOEODOMINANCEBASEDFITNESSASSIGNMENT_H_*/

4
trunk/paradiseo-moeo/src/fitness/moeoDominanceCountFitnessAssignment.h
View file

@ -46,14 +46,14 @@
#include <archive/moeoUnboundedArchive.h> #include <archive/moeoUnboundedArchive.h>
#include <comparator/moeoObjectiveVectorComparator.h> #include <comparator/moeoObjectiveVectorComparator.h>
#include <comparator/moeoParetoObjectiveVectorComparator.h> #include <comparator/moeoParetoObjectiveVectorComparator.h>
#include <fitness/moeoParetoBasedFitnessAssignment.h> #include <fitness/moeoDominanceBasedFitnessAssignment.h>
#include <utils/moeoDominanceMatrix.h> #include <utils/moeoDominanceMatrix.h>
/** /**
* Fitness assignment sheme that computes how many solutions does each solution dominate. * Fitness assignment sheme that computes how many solutions does each solution dominate.
*/ */
template < class MOEOT > template < class MOEOT >
class moeoDominanceCountFitnessAssignment : public moeoParetoBasedFitnessAssignment < MOEOT > class moeoDominanceCountFitnessAssignment : public moeoDominanceBasedFitnessAssignment < MOEOT >
{ {
public: public:

4
trunk/paradiseo-moeo/src/fitness/moeoDominanceCountRankingFitnessAssignment.h
View file

@ -47,7 +47,7 @@
#include <archive/moeoUnboundedArchive.h> #include <archive/moeoUnboundedArchive.h>
#include <comparator/moeoObjectiveVectorComparator.h> #include <comparator/moeoObjectiveVectorComparator.h>
#include <comparator/moeoParetoObjectiveVectorComparator.h> #include <comparator/moeoParetoObjectiveVectorComparator.h>
#include <fitness/moeoParetoBasedFitnessAssignment.h> #include <fitness/moeoDominanceBasedFitnessAssignment.h>
#include <utils/moeoDominanceMatrix.h> #include <utils/moeoDominanceMatrix.h>
/** /**
@ -57,7 +57,7 @@
* Computer Engineering and Networks Laboratory (TIK), ETH Zurich, Zurich, Switzerland, 2001. * Computer Engineering and Networks Laboratory (TIK), ETH Zurich, Zurich, Switzerland, 2001.
*/ */
template < class MOEOT > template < class MOEOT >
class moeoDominanceCountRankingFitnessAssignment : public moeoParetoBasedFitnessAssignment < MOEOT > class moeoDominanceCountRankingFitnessAssignment : public moeoDominanceBasedFitnessAssignment < MOEOT >
{ {
public: public:

4
trunk/paradiseo-moeo/src/fitness/moeoDominanceRankFitnessAssignment.h
View file

@ -45,14 +45,14 @@
#include <archive/moeoArchive.h> #include <archive/moeoArchive.h>
#include <comparator/moeoObjectiveVectorComparator.h> #include <comparator/moeoObjectiveVectorComparator.h>
#include <comparator/moeoParetoObjectiveVectorComparator.h> #include <comparator/moeoParetoObjectiveVectorComparator.h>
#include <fitness/moeoParetoBasedFitnessAssignment.h> #include <fitness/moeoDominanceBasedFitnessAssignment.h>
#include <utils/moeoDominanceMatrix.h> #include <utils/moeoDominanceMatrix.h>
/** /**
* Fitness assignment sheme that computes how many solutions each solution is dominated by. * Fitness assignment sheme that computes how many solutions each solution is dominated by.
*/ */
template < class MOEOT > template < class MOEOT >
class moeoDominanceRankFitnessAssignment : public moeoParetoBasedFitnessAssignment < MOEOT > class moeoDominanceRankFitnessAssignment : public moeoDominanceBasedFitnessAssignment < MOEOT >
{ {
public: public:

4
trunk/paradiseo-moeo/src/fitness/moeoFastNonDominatedSortingFitnessAssignment.h
View file

@ -43,7 +43,7 @@
#include <comparator/moeoObjectiveObjectiveVectorComparator.h> #include <comparator/moeoObjectiveObjectiveVectorComparator.h>
#include <comparator/moeoObjectiveVectorComparator.h> #include <comparator/moeoObjectiveVectorComparator.h>
#include <comparator/moeoParetoObjectiveVectorComparator.h> #include <comparator/moeoParetoObjectiveVectorComparator.h>
#include <fitness/moeoParetoBasedFitnessAssignment.h> #include <fitness/moeoDominanceBasedFitnessAssignment.h>
/** /**
@ -54,7 +54,7 @@
* This strategy is, for instance, used in NSGA and NSGA-II. * This strategy is, for instance, used in NSGA and NSGA-II.
*/ */
template < class MOEOT > template < class MOEOT >
class moeoFastNonDominatedSortingFitnessAssignment : public moeoParetoBasedFitnessAssignment < MOEOT > class moeoFastNonDominatedSortingFitnessAssignment : public moeoDominanceBasedFitnessAssignment < MOEOT >
{ {
public: public:

8
trunk/paradiseo-moeo/src/moeo
View file

@ -99,17 +99,17 @@
#include <fitness/moeoAchievementFitnessAssignment.h> #include <fitness/moeoAchievementFitnessAssignment.h>
#include <fitness/moeoBinaryIndicatorBasedFitnessAssignment.h> #include <fitness/moeoBinaryIndicatorBasedFitnessAssignment.h>
#include <fitness/moeoCriterionBasedFitnessAssignment.h> #include <fitness/moeoCriterionBasedFitnessAssignment.h>
#include <fitness/moeoDominanceBasedFitnessAssignment.h>
#include <fitness/moeoDominanceCountFitnessAssignment.h>
#include <fitness/moeoDominanceCountRankingFitnessAssignment.h>
#include <fitness/moeoDominanceRankFitnessAssignment.h>
#include <fitness/moeoDummyFitnessAssignment.h> #include <fitness/moeoDummyFitnessAssignment.h>
#include <fitness/moeoExpBinaryIndicatorBasedFitnessAssignment.h> #include <fitness/moeoExpBinaryIndicatorBasedFitnessAssignment.h>
#include <fitness/moeoFastNonDominatedSortingFitnessAssignment.h> #include <fitness/moeoFastNonDominatedSortingFitnessAssignment.h>
#include <fitness/moeoFitnessAssignment.h> #include <fitness/moeoFitnessAssignment.h>
#include <fitness/moeoIndicatorBasedFitnessAssignment.h> #include <fitness/moeoIndicatorBasedFitnessAssignment.h>
#include <fitness/moeoParetoBasedFitnessAssignment.h>
#include <fitness/moeoScalarFitnessAssignment.h> #include <fitness/moeoScalarFitnessAssignment.h>
#include <fitness/moeoUnaryIndicatorBasedFitnessAssignment.h> #include <fitness/moeoUnaryIndicatorBasedFitnessAssignment.h>
#include <fitness/moeoDominanceCountFitnessAssignment.h>
#include <fitness/moeoDominanceCountRankingFitnessAssignment.h>
#include <fitness/moeoDominanceRankFitnessAssignment.h>
#include <metric/moeoAdditiveEpsilonBinaryMetric.h> #include <metric/moeoAdditiveEpsilonBinaryMetric.h>
#include <metric/moeoContributionMetric.h> #include <metric/moeoContributionMetric.h>