from moeoParetoBasedFitnessAssignment to moeoDominanceBasedFitnessAssignment

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1268 331e1502-861f-0410-8da2-ba01fb791d7f

trunk/paradiseo-moeo/src/fitness/moeoDominanceBasedFitnessAssignment.h

@@ -0,0 +1,50 @@
+/*
+* <moeoDominanceBasedFitnessAssignment.h>
+* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
+* (C) OPAC Team, LIFL, 2002-2008
+*
+* Arnaud Liefooghe
+*
+* This software is governed by the CeCILL license under French law and
+* abiding by the rules of distribution of free software.  You can  use,
+* modify and/ or redistribute the software under the terms of the CeCILL
+* license as circulated by CEA, CNRS and INRIA at the following URL
+* "http://www.cecill.info".
+*
+* As a counterpart to the access to the source code and  rights to copy,
+* modify and redistribute granted by the license, users are provided only
+* with a limited warranty  and the software's author,  the holder of the
+* economic rights,  and the successive licensors  have only  limited liability.
+*
+* In this respect, the user's attention is drawn to the risks associated
+* with loading,  using,  modifying and/or developing or reproducing the
+* software by the user in light of its specific status of free software,
+* that may mean  that it is complicated to manipulate,  and  that  also
+* therefore means  that it is reserved for developers  and  experienced
+* professionals having in-depth computer knowledge. Users are therefore
+* encouraged to load and test the software's suitability as regards their
+* requirements in conditions enabling the security of their systems and/or
+* data to be ensured and,  more generally, to use and operate it in the
+* same conditions as regards security.
+* The fact that you are presently reading this means that you have had
+* knowledge of the CeCILL license and that you accept its terms.
+*
+* ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+* Contact: paradiseo-help@lists.gforge.inria.fr
+*
+*/
+//-----------------------------------------------------------------------------
+
+#ifndef MOEODOMINANCEBASEDFITNESSASSIGNMENT_H_
+#define MOEODOMINANCEBASEDFITNESSASSIGNMENT_H_
+
+#include <fitness/moeoFitnessAssignment.h>
+
+/**
+ * moeoDominanceBasedFitnessAssignment is a moeoFitnessAssignment for dominance-based strategies.
+ */
+template < class MOEOT >
+class moeoDominanceBasedFitnessAssignment : public moeoFitnessAssignment < MOEOT >
+{};
+
+#endif /*MOEODOMINANCEBASEDFITNESSASSIGNMENT_H_*/

trunk/paradiseo-moeo/src/fitness/moeoDominanceCountFitnessAssignment.h

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

trunk/paradiseo-moeo/src/fitness/moeoDominanceCountRankingFitnessAssignment.h

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

trunk/paradiseo-moeo/src/fitness/moeoDominanceRankFitnessAssignment.h

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

trunk/paradiseo-moeo/src/fitness/moeoFastNonDominatedSortingFitnessAssignment.h

@@ -43,7 +43,7 @@
 #include <comparator/moeoObjectiveObjectiveVectorComparator.h>
 #include <comparator/moeoObjectiveVectorComparator.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.
  */
 template < class MOEOT >
-class moeoFastNonDominatedSortingFitnessAssignment : public moeoParetoBasedFitnessAssignment < MOEOT >
+class moeoFastNonDominatedSortingFitnessAssignment : public moeoDominanceBasedFitnessAssignment < MOEOT >
   {
   public:
 

trunk/paradiseo-moeo/src/moeo

@@ -99,17 +99,17 @@
 #include <fitness/moeoAchievementFitnessAssignment.h>
 #include <fitness/moeoBinaryIndicatorBasedFitnessAssignment.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/moeoExpBinaryIndicatorBasedFitnessAssignment.h>
 #include <fitness/moeoFastNonDominatedSortingFitnessAssignment.h>
 #include <fitness/moeoFitnessAssignment.h>
 #include <fitness/moeoIndicatorBasedFitnessAssignment.h>
-#include <fitness/moeoParetoBasedFitnessAssignment.h>
 #include <fitness/moeoScalarFitnessAssignment.h>
 #include <fitness/moeoUnaryIndicatorBasedFitnessAssignment.h>
-#include <fitness/moeoDominanceCountFitnessAssignment.h>
-#include <fitness/moeoDominanceCountRankingFitnessAssignment.h>
-#include <fitness/moeoDominanceRankFitnessAssignment.h>
 
 #include <metric/moeoAdditiveEpsilonBinaryMetric.h>
 #include <metric/moeoContributionMetric.h>