Fitness assignment schemes added

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

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

@@ -0,0 +1,146 @@
+/*
+ * <moeoScalarizationFunctionMetricFitnessAssignment.h>
+ * Copyright (C) DOLPHIN Project-Team, INRIA Lille-Nord Europe, 2006-2008
+ * (C) OPAC Team, LIFL, 2002-2008
+ *
+ * François Legillon
+ *
+ * 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
+ *
+ */
+//-----------------------------------------------------------------------------
+// moeoScalarizationFunctionMetricFitnessAssignment.h
+//-----------------------------------------------------------------------------
+#ifndef MOEOASFAFITNESSASSIGNMENT_H_
+#define MOEOASFAFITNESSASSIGNMENT_H_
+
+#include <eoPop.h>
+#include <fitness/moeoSingleObjectivization.h>
+#include <distance/moeoAchievementScalarizingFunctionDistance.h>
+#include <metric/moeoDistanceMetric.h>
+#include <utils/moeoObjectiveVectorNormalizer.h>
+
+/*
+ * Fitness assignment scheme which use a metric
+ */
+template < class MOEOT>
+class moeoAchievementScalarizingFunctionMetricFitnessAssignment : public moeoSingleObjectivization < MOEOT >
+{
+	public:
+
+		/** the objective vector type of the solutions */
+		typedef typename MOEOT::ObjectiveVector ObjectiveVector;
+		typedef typename MOEOT::Fitness Fitness;
+		typedef typename ObjectiveVector::Type Type;
+
+		/**
+		 * ctor with normalizer
+		 * @param _rho
+		 * @param _reference the reference point
+		 * @param _weight the weights applied to the objectives
+		 * @param _normalizer the normalizer to apply to objectiveVectors
+		 */
+		moeoAchievementScalarizingFunctionMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector& _reference, const ObjectiveVector& _weight, moeoObjectiveVectorNormalizer<MOEOT>& _normalizer) : normalizer(_normalizer), eval(defaultEval), distance(_rho, _weight),	metric( distance, _reference, defaultNormalizer){}
+
+		/**
+		 * ctor with an evaluing fonction, applied if give moeot is invalid
+		 * @param _rho
+		 * @param _reference the reference point
+		 * @param _weight the weights applied to the objectives
+		 * @param _eval a evalFunc to regenerate the objectiveVector if needed
+		 */
+		moeoAchievementScalarizingFunctionMetricFitnessAssignment(unsigned int _rho, ObjectiveVector& _reference, const ObjectiveVector& _weight, eoEvalFunc<MOEOT>& _eval): eval(_eval), normalizer(defaultNormalizer), distance(_rho, _weight),	metric( distance, _reference, defaultNormalizer){}
+
+		/**
+		 * ctor with an evaluing fonction, applied if give moeot is invalid, and a noramlizer, applied to ObjectiveVectors
+		 * @param _rho
+		 * @param _reference the reference point
+		 * @param _weight the weights applied to the objectives
+		 * @param _normalizer the normalizer to apply to objectiveVectors
+		 * @param _eval a evalFunc to regenerate the objectiveVector if needed
+		 */
+		moeoAchievementScalarizingFunctionMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector& _reference, const ObjectiveVector& _weight, moeoObjectiveVectorNormalizer<MOEOT>& _normalizer, eoEvalFunc<MOEOT>& _eval) :	normalizer(_normalizer), eval(_eval), distance(_rho, _weight), metric(distance, _reference, _normalizer){}
+
+		/**
+		  default constructor
+		 * @param _rho
+		 * @param _reference the reference point
+		 * @param _weight the weights applied to the objectives
+		 */
+		moeoAchievementScalarizingFunctionMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector& _reference, const ObjectiveVector& _weight) : eval(defaultEval), normalizer(defaultNormalizer), distance(_rho, _weight), metric(distance, _reference, defaultNormalizer){}
+
+		/** 
+		 * Sets the fitness values for a moeot
+		 * @param _mo the MOEOT
+		 */
+		void operator()(MOEOT &  _mo){
+			if (_mo.invalidObjectiveVector())
+				eval(_mo);
+			_mo.fitness(operator()(_mo.objectiveVector()));
+		}
+
+		/**
+		  return the fitness of a valid objectiveVector
+		  @param _mo the objectiveVector
+		  @return the fitness value of _mo
+		 */
+		typename MOEOT::Fitness operator()(const typename MOEOT::ObjectiveVector& _mo){
+			return -metric(_mo);
+		}
+
+		/**
+		 * Sets the fitness values for every solution contained in the populing _pop  (and in the archive)
+		 * @param _pop the populing
+		 */
+		void operator()(eoPop < MOEOT > & _pop)
+		{
+			for (unsigned int k=0; k < _pop.size(); k++)
+				operator()(_pop[k]);
+		}
+
+		/**
+		 * @param _pop the populing
+		 * @param _objVec the objective vector
+		 */
+		void updateByDeleting(eoPop < MOEOT > & _pop, ObjectiveVector & _objVec){}
+
+	private:
+
+		moeoObjectiveVectorNormalizer<MOEOT> defaultNormalizer;
+		moeoAchievementScalarizingFunctionDistance<MOEOT> distance;
+		moeoDistanceMetric<MOEOT> metric;
+		eoEvalFunc<MOEOT> &eval;
+		moeoObjectiveVectorNormalizer<MOEOT> &normalizer;
+
+		class DummyEval: public eoEvalFunc<MOEOT>{
+			void operator()(MOEOT &moeo){
+			}
+		} defaultEval;
+};
+
+#endif /*moeoAugmentedScalarizingFunctionMetricFitnessASSIGNMENT_H_*/

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

@@ -0,0 +1,129 @@
+/*
+ * <moeoAggregationFitnessAssignment.h>
+ * Copyright (C) DOLPHIN Project-Team, INRIA Lille-Nord Europe, 2006-2008
+ * (C) OPAC Team, LIFL, 2002-2008
+ *
+ * François Legillon
+ *
+ * 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
+ *
+ */
+//-----------------------------------------------------------------------------
+// moeoAggregationFitnessAssignment.h
+//-----------------------------------------------------------------------------
+#ifndef MOEOAGGREGATIONFITNESSASSIGNMENT_H_
+#define MOEOAGGREGATIONFITNESSASSIGNMENT_H_
+
+#include <eoPop.h>
+#include <eoEvalFunc.h>
+#include <fitness/moeoSingleObjectivization.h>
+
+/*
+ * Fitness assignment scheme which use weight foreach objectives
+ */
+template < class MOEOT >
+class moeoAggregationFitnessAssignment : public moeoSingleObjectivization < MOEOT >
+{
+	public:
+
+		/** the objective vector type of the solutions */
+		typedef typename MOEOT::ObjectiveVector ObjectiveVector;
+		typedef typename MOEOT::Fitness Fitness;
+
+		/**
+		 * Default ctor
+		 * @param _weight vectors contains all weights.
+		 * @param _eval a eval function, to revalidate the objectiveVector if needed
+		 */
+		moeoAggregationFitnessAssignment(std::vector<double> & _weight,eoEvalFunc<MOEOT> &_eval) : weight(_weight),eval(_eval){}
+
+		/**
+		 * Ctor with a dummy evaluation function
+		 * @param _weight vectors contains all weights.
+		 */
+		moeoAggregationFitnessAssignment(std::vector<double> & _weight) : weight(_weight),eval(defaultEval){}
+
+		/** 
+		 * Sets the fitness values for _moeot
+		 * @param _moeot the MOEOT
+		 */
+		virtual void operator()(MOEOT &  _moeot){
+			if (_moeot.invalidObjectiveVector())
+				eval(_moeot);
+			_moeot.fitness(operator()(_moeot.objectiveVector()));
+		}
+
+		/**
+		 * function which calculate the fitness from an objectiveVector (which has troi be valid.)
+		 * @param _mo an valid objectiveVector
+		 * @return the fitness value of _mo
+		 */
+		virtual Fitness operator()(const typename MOEOT::ObjectiveVector &  _mo){
+			unsigned int dim=_mo.nObjectives();
+			Fitness res=0;
+			if (dim>weight.size()){
+				std::cout<<"moeoAggregationFitnessAssignmentFitness: Error -> given weight dimension is smaller than MOEOTs"<<std::endl;
+				return res;
+			}
+			for(unsigned int l=0; l<dim; l++){
+				if (_mo.minimizing(l))
+					res-=(_mo[l]) * weight[l];
+				else
+					res+=(_mo[l]) * weight[l];
+			}
+			return res;
+		}
+
+		/**
+		 * Sets the fitness values for every solution contained in the population _pop  (and in the archive)
+		 * @param _pop the population
+		 */
+		virtual void operator()(eoPop < MOEOT > & _pop){
+			for (unsigned int k=0; k < _pop.size(); k++)
+				operator()(_pop[k]);
+		}
+
+		/**
+		 * Warning: no yet implemented: Updates the fitness values of the whole population _pop by taking the deletion of the objective vector _objVec into account.
+		 * @param _pop the population
+		 * @param _objVec the objective vector
+		 */
+		void updateByDeleting(eoPop < MOEOT > & _pop, ObjectiveVector & _objVec){}
+
+	private:
+
+		class DummyEval: public eoEvalFunc<MOEOT>{
+			void operator()(MOEOT &moeo){}
+		}defaultEval;
+
+		//the vector of weight
+		std::vector<double>& weight;
+		eoEvalFunc<MOEOT>& eval;
+
+};
+#endif /*MOEOAGGREGATIONFITNESSASSIGNMENT_H_*/

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

@@ -0,0 +1,160 @@
+/*
+ * <moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment.h>
+ * Copyright (C) DOLPHIN Project-Team, INRIA Lille-Nord Europe, 2006-2008
+ * (C) OPAC Team, LIFL, 2002-2008
+ *
+ * François Legillon
+ *
+ * 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
+ *
+ */
+//-----------------------------------------------------------------------------
+// moeoAugmentedScalarizingFunctionMetricFitnessAssignment.h
+//-----------------------------------------------------------------------------
+#ifndef MOEOAUGASFAFITNESSASSIGNMENT_H_
+#define MOEOAUGASFAFITNESSASSIGNMENT_H_
+
+#include <moeo>
+#include <eo>
+#include <vector>
+#include <eoPop.h>
+#include <fitness/moeoSingleObjectivization.h>
+#include <utils/moeoObjectiveVectorNormalizer.h>
+#include <distance/moeoAugmentedAchievementScalarizingFunctionDistance.h>
+
+/*
+ * Fitness assignment scheme which use a metric
+ */
+template < class MOEOT>
+class moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment : public moeoSingleObjectivization < MOEOT >
+{
+	public:
+
+
+		/** the objective vector type of the solutions */
+		typedef typename MOEOT::ObjectiveVector ObjectiveVector;
+		typedef typename MOEOT::Fitness Fitness;
+		typedef typename ObjectiveVector::Type Type;
+
+
+		/**
+		 * ctor with normalizer
+		 * @param _normalizer the normalizer to apply to objectiveVectors
+		 * @param _rho
+		 * @param _reference the reference point
+		 * @param _weight the weights applied to the objectives
+		 */
+		moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment(unsigned int _rho,const ObjectiveVector &_reference,const ObjectiveVector &_weight,moeoObjectiveVectorNormalizer<MOEOT> &_normalizer) : normalizer(_normalizer),eval(defaultEval), distance(_rho,_weight), metric(distance,_reference,normalizer)
+	{}
+		/**
+		 * ctor with an evaluing fonction, applied if give moeot is invalid
+		 * @param _eval a evalFunc to regenerate the objectiveVector if needed
+		 * @param _rho
+		 * @param _reference the reference point
+		 * @param _weight the weights applied to the objectives
+		 */
+		moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector &_reference,const ObjectiveVector &_weight,eoEvalFunc<MOEOT> &_eval) : eval(_eval),normalizer(defaultNormalizer), distance(_rho,_weight), metric(distance,_reference,normalizer)
+	{}
+		/**
+		 * ctor with an evaluing fonction, applied if give moeot is invalid, and a noramlizer, applied to ObjectiveVectors
+		 * @param _eval a evalFunc to regenerate the objectiveVector if needed
+		 * @param _normalizer the normalizer to apply to objectiveVectors
+		 * @param _rho
+		 * @param _reference the reference point
+		 * @param _weight the weights applied to the objectives
+		 */
+		moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector &_reference,const ObjectiveVector &_weight,moeoObjectiveVectorNormalizer<MOEOT> &_normalizer,eoEvalFunc<MOEOT> &_eval) :normalizer(_normalizer),eval(_eval), distance(_rho,_weight), metric(distance,_reference,normalizer)
+	{}
+		/**
+		  default constructor
+		 * @param _rho
+		 * @param _reference the reference point
+		 * @param _weight the weights applied to the objectives
+		  */
+		moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector &_reference,const ObjectiveVector &_weight) : eval(defaultEval),normalizer(defaultNormalizer), distance(_rho,_weight), metric(distance,_reference,normalizer)
+	{}
+
+		 /** 
+		  * Sets the fitness values for a moeot
+		  * @param _mo the MOEOT
+		  */
+		void operator()(MOEOT &  _mo){
+			if (_mo.invalidObjectiveVector()) eval(_mo);
+			_mo.fitness(operator()(_mo.objectiveVector()));
+
+		}
+
+		/**
+		  return the fitness of a valid objectiveVector
+		  @param _mo the objectiveVector
+		  @return the fitness value of _mo
+		  */
+		typename MOEOT::Fitness operator()(const typename MOEOT::ObjectiveVector &  _mo){
+			return -metric(_mo);
+		}
+
+
+		/**
+		 * Sets the fitness values for every solution contained in the populing _pop  (and in the archive)
+		 * @param _pop the populing
+		 */
+		void operator()(eoPop < MOEOT > & _pop)
+		{
+			unsigned int pop_size= _pop.size();
+			for (unsigned int k=0; k<pop_size; k++){
+				operator()(_pop[k]);
+			}
+		}
+
+
+
+
+		/**
+		 * @param _pop the populing
+		 * @param _objVec the objective vector
+		 */
+		void updateByDeleting(eoPop < MOEOT > & _pop, ObjectiveVector & _objVec)
+		{
+		}
+
+
+	private:
+
+		moeoObjectiveVectorNormalizer<MOEOT> defaultNormalizer;
+		moeoAugmentedAchievementScalarizingFunctionDistance<MOEOT> distance;
+		moeoObjectiveVectorNormalizer<MOEOT> &normalizer;
+		moeoDistanceMetric<MOEOT> metric;
+		eoEvalFunc<MOEOT> &eval;
+		class DummyEval: public eoEvalFunc<MOEOT>{
+			void operator()(MOEOT &moeo){
+			}
+		} defaultEval;
+
+};
+
+#endif /*moeoAugmentedScalarizingFunctionMetricFitnessASSIGNMENT_H_*/

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

@@ -0,0 +1,144 @@
+/*
+ * <moeoAugmentedWeightedChebychevMetricFitnessAssignment.h>
+ * Copyright (C) DOLPHIN Project-Team, INRIA Lille-Nord Europe, 2006-2008
+ * (C) OPAC Team, LIFL, 2002-2008
+ *
+ * François Legillon
+ *
+ * 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
+ *
+ */
+//-----------------------------------------------------------------------------
+// moeoAugmentedWeightedChebychevMetricFitnessAssignment.h
+//-----------------------------------------------------------------------------
+#ifndef MOEOAUGCHEVMETRICFITNESSASSIGNMENT_H_
+#define MOEOAUGCHEVMETRICFITNESSASSIGNMENT_H_
+
+#include <eoPop.h>
+#include <fitness/moeoSingleObjectivization.h>
+#include <utils/moeoObjectiveVectorNormalizer.h>
+
+/*
+ * Fitness assignment scheme which use a metric
+ */
+template < class MOEOT>
+class moeoAugmentedWeightedChebychevMetricFitnessAssignment : public moeoSingleObjectivization < MOEOT >
+{
+	public:
+
+		/** the objective vector type of the solutions */
+		typedef typename MOEOT::ObjectiveVector ObjectiveVector;
+		typedef typename MOEOT::Fitness Fitness;
+		typedef typename ObjectiveVector::Type Type;
+
+		/**
+		 * ctor with normalizer
+		 * @param _rho
+		 * @param _reference the reference point
+		 * @param _weight the weights applied to the objectives
+		 * @param _normalizer the normalizer to apply to objectiveVectors
+		 */
+		moeoAugmentedWeightedChebychevMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector& _reference, const ObjectiveVector& _weight, moeoObjectiveVectorNormalizer<MOEOT>& _normalizer) : normalizer(_normalizer), eval(defaultEval), distance(_rho, _weight), metric(distance, _reference, normalizer){}
+
+		/**
+		 * ctor with an evaluation fonction, applied if give moeot is invalid
+		 * @param _rho
+		 * @param _reference the reference point
+		 * @param _weight the weights applied to the objectives
+		 * @param _eval a evalFunc to regenerate the objectiveVector if needed
+		 */
+		moeoAugmentedWeightedChebychevMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector& _reference, const ObjectiveVector& _weight, eoEvalFunc<MOEOT>& _eval) : eval(_eval), normalizer(defaultNormalizer), distance(_rho, _weight), metric(distance, _reference, normalizer){}
+
+		/**
+		 * ctor with an evaluation fonction, applied if give moeot is invalid, and a noramlizer, applied to ObjectiveVectors
+		 * @param _rho
+		 * @param _reference the reference point
+		 * @param _weight the weights applied to the objectives
+		 * @param _normalizer the normalizer to apply to objectiveVectors
+		 * @param _eval a evalFunc to regenerate the objectiveVector if needed
+		 */
+		moeoAugmentedWeightedChebychevMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector& _reference, const ObjectiveVector& _weight, moeoObjectiveVectorNormalizer<MOEOT>& _normalizer, eoEvalFunc<MOEOT>& _eval) : normalizer(_normalizer), eval(_eval), distance(_rho, _weight), metric(distance, _reference, normalizer){}
+
+		/**
+		  default constructor
+		 * @param _rho
+		 * @param _reference the reference point
+		 * @param _weight the weights applied to the objectives
+		  */
+		moeoAugmentedWeightedChebychevMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector& _reference, const ObjectiveVector& _weight) : eval(defaultEval), normalizer(defaultNormalizer), distance(_rho, _weight), metric(distance, _reference, normalizer){}
+
+		 /** 
+		  * Sets the fitness values for a moeot
+		  * @param _mo the MOEOT
+		  */
+		void operator()(MOEOT &  _mo){
+			if (_mo.invalidObjectiveVector())
+				eval(_mo);
+			_mo.fitness(operator()(_mo.objectiveVector()));
+		}
+
+		/**
+		  return the fitness of a valid objectiveVector
+		  @param _mo the objectiveVector
+		  @return the fitness value of _mo
+		  */
+		typename MOEOT::Fitness operator()(const typename MOEOT::ObjectiveVector & _mo){
+			return -metric(_mo);
+		}
+
+		/**
+		 * Sets the fitness values for every solution contained in the population _pop  (and in the archive)
+		 * @param _pop the population
+		 */
+		void operator()(eoPop < MOEOT > & _pop){
+			for (unsigned int k=0; k<_pop.size(); k++)
+				operator()(_pop[k]);
+		}
+
+		/**
+		 * @param _pop the population
+		 * @param _objVec the objective vector
+		 */
+		void updateByDeleting(eoPop < MOEOT > & _pop, ObjectiveVector & _objVec){}
+
+	private:
+
+		class DummyEval: public eoEvalFunc<MOEOT>{
+			void operator()(MOEOT &moeo){
+			}
+		} defaultEval;
+
+		moeoAugmentedWeightedChebychevDistance<MOEOT> distance;
+		moeoObjectiveVectorNormalizer<MOEOT> defaultNormalizer;
+		moeoObjectiveVectorNormalizer<MOEOT> &normalizer;
+		moeoDistanceMetric<MOEOT> metric;
+		eoEvalFunc<MOEOT> &eval;
+
+};
+
+#endif /*moeoAugmentedWeightedChebychevMetricFitnessASSIGNMENT_H_*/

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

@@ -0,0 +1,171 @@
+/*
+ * <moeoConstraintFitnessAssignment.h>
+ * Copyright (C) DOLPHIN Project-Team, INRIA Lille-Nord Europe, 2006-2008
+ * (C) OPAC Team, LIFL, 2002-2008
+ *
+ * François Legillon
+ *
+ * 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
+ *
+ */
+//-----------------------------------------------------------------------------
+// moeoConstraintFitnessAssignment.h
+//-----------------------------------------------------------------------------
+#ifndef MOEOCONSTRAINTFITNESSASSIGNMENT_H_
+#define MOEOCONSTRAINTFITNESSASSIGNMENT_H_
+
+#include <eoPop.h>
+#include <fitness/moeoSingleObjectivization.h>
+#include <utils/moeoObjectiveVectorNormalizer.h>
+
+/*
+ * Fitness assignment scheme which give a penalty if MOEOT does not respect constraints
+ */
+template < class MOEOT >
+class moeoConstraintFitnessAssignment : public moeoSingleObjectivization < MOEOT >
+{
+	public:
+
+		/** the objective vector type of the solutions */
+		typedef typename MOEOT::ObjectiveVector ObjectiveVector;
+		/** the fitness type of the solutions */
+		typedef typename MOEOT::Fitness Fitness;
+		/** the type of the solutions */
+		typedef typename ObjectiveVector::Type Type;
+
+		/**
+		 * Default ctor
+		 * @param _weight vectors contains all weights to apply for not respecting the contraint in each dimension.
+		 * @param _constraint vector containing the constraints, normalizer is applied to it
+		 * @param _to_optimize dimension in which we ignore the constraint
+		 * @param _normalizer normalizer to apply to each objective
+		 */
+		moeoConstraintFitnessAssignment(std::vector<double> & _weight, ObjectiveVector &_constraint, int _to_optimize, moeoObjectiveVectorNormalizer<MOEOT> &_normalizer, eoEvalFunc<MOEOT> &_eval) : weight(_weight),constraint(_constraint),to_optimize(_to_optimize),normalizer(_normalizer),eval(_eval),to_eval(true){}
+
+		/**
+		 * Ctor with a dummy eval
+		 * @param _weight vectors contains all weights to apply for not respecting the contraint in each dimension.
+		 * @param _constraint vector containing the constraints, normalizer is applied to it
+		 * @param _to_optimize dimension in which we ignore the constraint
+		 * @param _normalizer normalizer to apply to each objective
+		 */
+		moeoConstraintFitnessAssignment(std::vector<double> & _weight, ObjectiveVector &_constraint, int _to_optimize, moeoObjectiveVectorNormalizer<MOEOT> &_normalizer) : weight(_weight), constraint(_constraint), to_optimize(_to_optimize), normalizer(_normalizer), eval(defaultEval), to_eval(false){}
+
+		/** 
+		 * Sets the fitness values for every solution contained in the population _pop  (and in the archive)
+		 * @param _mo the MOEOT
+		 */
+		void operator()(MOEOT &  _mo){
+			if (to_eval && _mo.invalidObjectiveVector())
+				eval(_mo);
+			_mo.fitness(operator()(_mo.objectiveVector()));
+		}
+
+		/**
+		 * Calculate a fitness from a valid objectiveVector
+		 * @param _mo a valid objectiveVector
+		 * @return the fitness of _mo
+		 */
+		Fitness operator()(const typename MOEOT::ObjectiveVector &  _mo){
+			unsigned int dim=_mo.nObjectives();
+			Fitness res=0;
+			if (dim>weight.size()){
+				std::cout<<"moeoAggregationFitnessAssignmentFitness: ouch, given weight dimension is smaller than MOEOTs"<<std::endl;
+			}
+			else{
+				for(unsigned int l=0; l<dim; l++){
+					if (l==to_optimize)
+						if (_mo.minimizing(l))
+							res-=(normalizer(_mo)[l]) * weight[l];
+						else
+							res+=(normalizer(_mo)[l]) * weight[l];
+					else{
+						if(_mo.minimizing(l)){
+							if (normalizer(_mo)[l]>normalizer(constraint)[l])
+								res-=(normalizer(_mo)[l]-normalizer(constraint)[l])*weight[l];
+						}
+						else{
+							if (normalizer(_mo)[l]<normalizer(constraint)[l])
+								//negative so we add it instead of removing it
+								res+=(normalizer(_mo)[l]-normalizer(constraint)[l])*weight[l];
+						}
+					}
+				}
+			}
+			return res;
+		}
+
+		/**
+		 * Sets the fitness values for every solution contained in the population _pop  (and in the archive)
+		 * @param _pop the population
+		 */
+		void operator()(eoPop < MOEOT > & _pop)
+		{
+			for(unsigned int k=0; k<_pop.size(); k++)
+				operator()(_pop[k]);
+		}
+
+		/**
+		 * Warning: no yet implemented: Updates the fitness values of the whole population _pop by taking the deletion of the objective vector _objVec into account.
+		 * @param _pop the population
+		 * @param _objVec the objective vector
+		 */
+		void updateByDeleting(eoPop < MOEOT > & _pop, ObjectiveVector & _objVec)
+		{
+			//std::cout << "WARNING : updateByDeleting not implemented in moeoAssignmentFitnessAssignment" << std::endl;
+		}
+
+	private:
+
+		//dummy evaluation function
+		class DummyEval: public eoEvalFunc<MOEOT>{
+			void operator()(MOEOT &moeo){
+			}
+		} defaultEval;
+
+		//the vector of weight
+		std::vector<double> weight;
+
+		//the vector of constraints
+		ObjectiveVector constraint;
+
+		//index of the objective to optimize
+		int to_optimize;
+
+		//the normalizer
+		moeoObjectiveVectorNormalizer<MOEOT>& normalizer;
+
+		//the evaluation function
+		eoEvalFunc<MOEOT> &eval;
+
+		//true if the evaluation has to be done
+		bool to_eval;
+
+};
+
+#endif /*MOEOAGGREGATIONFITNESSASSIGNMENT_H_*/

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

@@ -0,0 +1,140 @@
+/*
+ * <moeoMetricFitnessAssignment.h>
+ * Copyright (C) DOLPHIN Project-Team, INRIA Lille-Nord Europe, 2006-2008
+ * (C) OPAC Team, LIFL, 2002-2008
+ *
+ * François Legillon
+ *
+ * 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
+ *
+ */
+//-----------------------------------------------------------------------------
+// moeoMetrucFitnessAssignment.h
+//-----------------------------------------------------------------------------
+#ifndef MOEOMETRICFITNESSASSIGNMENT_H_
+#define MOEOMETRICFITNESSASSIGNMENT_H_
+
+#include <moeo>
+#include <eo>
+#include <vector>
+#include <eoPop.h>
+#include <fitness/moeoSingleObjectivization.h>
+#include <utils/moeoObjectiveVectorNormalizer.h>
+
+/*
+ * Fitness assignment scheme which use a metric
+ */
+template < class MOEOT>
+class moeoMetricFitnessAssignment : public moeoSingleObjectivization < MOEOT >
+{
+	public:
+
+
+		/** the objective vector type of the solutions */
+		typedef typename MOEOT::ObjectiveVector ObjectiveVector;
+		typedef typename MOEOT::Fitness Fitness;
+		typedef typename ObjectiveVector::Type Type;
+
+
+		/**
+		 * Default ctor
+		 * @param _metric a metric function to calculate fitness
+		 * @param _negate true if fitness should be maxed
+		 */
+		moeoMetricFitnessAssignment(moeoUnaryMetric<ObjectiveVector,Fitness> &_metric, bool _negate=true) : metric(_metric),eval(defaultEval),negate(_negate)
+	{}
+		/**
+		 * ctor with an evaluation fonction, applied if give moeot is invalid
+		 * @param _eval a evalFunc to regenerate the objectiveVector if needed
+		 * @param _metric a metric function to calculate fitness
+		 * @param _negate true if fitness should be maxed
+		 */
+		moeoMetricFitnessAssignment(moeoUnaryMetric<ObjectiveVector,Fitness> &_metric,eoEvalFunc<MOEOT> &_eval, bool _negate=false) : metric(_metric),eval(_eval),negate(_negate)
+	{}
+
+		 /** 
+		  * Sets the fitness values for a moeot
+		  * @param _mo the MOEOT
+		  */
+		void operator()(MOEOT &  _mo){
+			if (_mo.invalidObjectiveVector()) eval(_mo);
+			_mo.fitness(operator()(_mo.objectiveVector()));
+
+		}
+
+		/**
+		  return the fitness of a valid objectiveVector
+		  @param _mo the objectiveVector
+		  @return the fitness value of _mo
+		  */
+		typename MOEOT::Fitness operator()(const typename MOEOT::ObjectiveVector &  _mo){
+			if (negate)
+			return 1/metric(_mo);
+			else return metric(_mo);
+		}
+
+
+		/**
+		 * Sets the fitness values for every solution contained in the population _pop  (and in the archive)
+		 * @param _pop the population
+		 */
+		void operator()(eoPop < MOEOT > & _pop)
+		{
+			unsigned int pop_size= _pop.size();
+			for (unsigned int k=0; k<pop_size; k++){
+				operator()(_pop[k]);
+			}
+		}
+
+
+
+
+		/**
+		 * Warning: no yet implemented: Updates the fitness values of the whole population _pop by taking the deletion of the objective vector _objVec into account.
+		 * @param _pop the population
+		 * @param _objVec the objective vector
+		 */
+		void updateByDeleting(eoPop < MOEOT > & _pop, ObjectiveVector & _objVec)
+		{
+			//std::cout << "WARNING : updateByDeleting not implemented in moeoAssignmentFitnessAssignment" << std::endl;
+		}
+
+
+	private:
+
+		moeoUnaryMetric<typename MOEOT::ObjectiveVector,Fitness> &metric;
+		eoEvalFunc<MOEOT> &eval;
+		bool negate;
+		class DummyEval: public eoEvalFunc<MOEOT>{
+			void operator()(MOEOT &moeo){
+			}
+		} defaultEval;
+
+};
+
+#endif /*MOEOMETRICFITNESSASSIGNMENT_H_*/

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

@@ -0,0 +1,67 @@
+/*
+* <moeoSingleObjectivization.h>
+* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2009
+* (C) OPAC Team, LIFL, 2002-2007
+*
+* François Legillon 
+*
+* 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 MOEOSINGLEOBJECTIVIZATION_H_
+#define MOEOSINGLEOBJECTIVIZATION_H_
+
+#include <fitness/moeoFitnessAssignment.h>
+#include <eoEvalFunc.h>
+/**
+ * Class to adapt multiobjective problems to single objective algorithms
+ */
+template < class MOEOT >
+class moeoSingleObjectivization : public moeoFitnessAssignment < MOEOT > , public eoEvalFunc < MOEOT >
+  {
+  public:
+
+    /**
+     * herited from moeoFitnessAssignment 
+     * @param _pop the population
+     */
+    virtual void operator () (eoPop < MOEOT > & _pop)=0;
+
+    /**
+      herited from eoEvalFunc      
+      @param _moeot
+     */
+    virtual void operator() (MOEOT & _moeot)=0;
+
+    virtual typename MOEOT::Fitness operator() (const typename MOEOT::ObjectiveVector & _obj)=0;
+	    
+  };
+
+#endif /*MOEOSINGLEOBJECTIVIZATION_H_*/

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

@@ -0,0 +1,149 @@
+/*
+ * <moeoWeightedChebychevMetricFitnessAssignment.h>
+ * Copyright (C) DOLPHIN Project-Team, INRIA Lille-Nord Europe, 2006-2008
+ * (C) OPAC Team, LIFL, 2002-2008
+ *
+ * François Legillon
+ *
+ * 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
+ *
+ */
+//-----------------------------------------------------------------------------
+// moeoWeightedChebychevMetricFitnessAssignment.h
+//-----------------------------------------------------------------------------
+#ifndef MOEOCHEVMETRICFITNESSASSIGNMENT_H_
+#define MOEOCHEVMETRICFITNESSASSIGNMENT_H_
+
+#include <moeo>
+#include <eo>
+#include <vector>
+#include <eoPop.h>
+#include <fitness/moeoSingleObjectivization.h>
+#include <utils/moeoObjectiveVectorNormalizer.h>
+#include <distance/moeoWeightedChebychevDistance.h>
+
+/*
+ * Fitness assignment scheme which use a metric
+ */
+template < class MOEOT>
+class moeoWeightedChebychevMetricFitnessAssignment : public moeoSingleObjectivization < MOEOT >
+{
+	public:
+
+		/** the objective vector type of the solutions */
+		typedef typename MOEOT::ObjectiveVector ObjectiveVector;
+		typedef typename MOEOT::Fitness Fitness;
+		typedef typename ObjectiveVector::Type Type;
+
+		/**
+		 * ctor with normalizer
+		 * @param _rho
+		 * @param _reference the reference point
+		 * @param _weight the weights applied to the objectives
+		 * @param _normalizer the normalizer to apply to objectiveVectors
+		 */
+		moeoWeightedChebychevMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector& _reference, const ObjectiveVector& _weight, moeoObjectiveVectorNormalizer<MOEOT>& _normalizer) : normalizer(_normalizer), eval(defaultEval), distance(_rho, _weight), metric(distance, _reference, _normalizer){}
+
+		/**
+		 * ctor with an evaluation fonction, applied if give moeot is invalid
+		 * @param _rho
+		 * @param _reference the reference point
+		 * @param _weight the weights applied to the objectives
+		 * @param _eval a evalFunc to regenerate the objectiveVector if needed
+		 */
+		moeoWeightedChebychevMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector& _reference, const ObjectiveVector& _weight, eoEvalFunc<MOEOT>& _eval) : eval(_eval), normalizer(defaultNormalizer), distance(_rho, _weight), metric(distance, _reference, normalizer){}
+
+		/**
+		 * ctor with an evaluation fonction, applied if give moeot is invalid, and a noramlizer, applied to ObjectiveVectors
+		 * @param _rho
+		 * @param _reference the reference point
+		 * @param _weight the weights applied to the objectives
+		 * @param _normalizer the normalizer to apply to objectiveVectors
+		 * @param _eval a evalFunc to regenerate the objectiveVector if needed
+		 */
+		moeoWeightedChebychevMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector& _reference, const ObjectiveVector& _weight, moeoObjectiveVectorNormalizer<MOEOT>& _normalizer, eoEvalFunc<MOEOT>& _eval) : normalizer(_normalizer), eval(_eval), distance(_rho, _weight), metric(distance, _reference, normalizer){}
+
+		/**
+		  default constructor
+		 * @param _rho
+		 * @param _reference the reference point
+		 * @param _weight the weights applied to the objectives
+		  */
+		moeoWeightedChebychevMetricFitnessAssignment(unsigned int _rho, const ObjectiveVector& _reference, const ObjectiveVector& _weight) : eval(defaultEval), normalizer(defaultNormalizer), distance(_rho, _weight), metric(distance, _reference, normalizer){}
+
+		 /** 
+		  * Sets the fitness values for a moeot
+		  * @param _mo the MOEOT
+		  */
+		void operator()(MOEOT &  _mo){
+			if (_mo.invalidObjectiveVector())
+				eval(_mo);
+			_mo.fitness(operator()(_mo.objectiveVector()));
+		}
+
+		/**
+		  return the fitness of a valid objectiveVector
+		  @param _mo the objectiveVector
+		  @return the fitness value of _mo
+		  */
+		typename MOEOT::Fitness operator()(const typename MOEOT::ObjectiveVector &  _mo){
+			return -metric(_mo);
+		}
+
+		/**
+		 * Sets the fitness values for every solution contained in the population _pop  (and in the archive)
+		 * @param _pop the population
+		 */
+		void operator()(eoPop < MOEOT > & _pop)
+		{
+			for (unsigned int k=0; k < _pop.size(); k++)
+				operator()(_pop[k]);
+		}
+
+		/**
+		 * @param _pop the population
+		 * @param _objVec the objective vector
+		 */
+		void updateByDeleting(eoPop < MOEOT > & _pop, ObjectiveVector & _objVec){}
+
+	private:
+
+		moeoWeightedChebychevDistance<MOEOT> distance;
+		moeoObjectiveVectorNormalizer<MOEOT> defaultNormalizer;
+		moeoObjectiveVectorNormalizer<MOEOT>& normalizer;
+		moeoDistanceMetric<MOEOT> metric;
+		eoEvalFunc<MOEOT> &eval;
+
+		class DummyEval: public eoEvalFunc<MOEOT>{
+			void operator()(MOEOT &moeo){
+			}
+		} defaultEval;
+
+};
+
+#endif /*moeoWeightedChebychevMetricFitnessASSIGNMENT_H_*/