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

Nettoyage

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1823 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2010-05-26 15:18:59 +00:00
commit f7490eeadd
51 changed files with 444 additions and 1385 deletions
Download patch file Download diff file Expand all files Collapse all files

109
trunk/paradiseo-moeo/src/distance/moeoAchievementScalarizingFunctionDistance.h
View file

@ -1,109 +0,0 @@
/*
* <moeoAchievementScalarizingFunctionDistance.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
* (C) OPAC Team, LIFL, 2002-2007
*
* Jeremie Humeau
* Arnaud Liefooghe
* 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 MOEOASFADIST_H_
#define MOEOASFADIST_H_
#include <utils/moeoObjectiveVectorNormalizer.h>
/**
Achievment scalarizing function aproach to calculate a distance
*/
template < class MOEOT>
class moeoAchievementScalarizingFunctionDistance : public moeoObjSpaceDistance< MOEOT >
{
public:
typedef typename MOEOT::ObjectiveVector ObjectiveVector;
typedef typename MOEOT::Fitness Fitness;
/**
constructor with a normalizer
@param _rho
@param _weight the weight to apply to each dimension
@param _normalizer the normalizer
*/
moeoAchievementScalarizingFunctionDistance(unsigned int _rho, const ObjectiveVector& _weight, moeoObjectiveVectorNormalizer<MOEOT>& _normalizer): normalizer(_normalizer), weight(_weight), rho(_rho){}
/**
constructor without a normalizer
@param _rho
@param _weight the weight to apply to each dimension
*/
moeoAchievementScalarizingFunctionDistance(unsigned int _rho, const ObjectiveVector& _weight): normalizer(defaultNormalizer), weight(_weight), rho(_rho){}
/**
fonction which calculate the distance
@param _obj the point to evaluate
@param _reference the reference to calculate the distance from
@return the fitness conrresponding to the distance
*/
const Fitness operator()(const ObjectiveVector& _reference, const ObjectiveVector& _obj){
unsigned int dim=_obj.size();
ObjectiveVector tmp1(_reference);
ObjectiveVector tmp2(_obj);
Fitness max=iteration(tmp2,tmp1,0,_obj.minimizing(0));
Fitness res=max;
for (unsigned i=0;i<dim;i++){
res=iteration(_obj,_reference,i,_obj.minimizing(i));
if (max<res)
max=res;
}
return max;
}
private:
moeoObjectiveVectorNormalizer<MOEOT> defaultNormalizer;
moeoObjectiveVectorNormalizer<MOEOT> &normalizer;
const ObjectiveVector &weight;
double rho;
Fitness iteration(const ObjectiveVector &obj, const ObjectiveVector& reference, int dim, bool mini){
ObjectiveVector obj_norm=normalizer(obj);
ObjectiveVector ref_norm=normalizer(reference);
Fitness res;
if (mini){
res=(obj_norm[dim]-ref_norm[dim]);
}else{
res=(ref_norm[dim]-obj_norm[dim]);
}
res=weight[dim]*res;
return res;
}
};
#endif

111
trunk/paradiseo-moeo/src/distance/moeoAugmentedAchievementScalarizingFunctionDistance.h
View file

@ -1,111 +0,0 @@
/*
* <moeoAugmentedAchievmentScalarizingFunctionDistance.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
* (C) OPAC Team, LIFL, 2002-2007
*
* Jeremie Humeau
* Arnaud Liefooghe
* Legillon François
*
* 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 MOEOASFAORDIST_H_
#define MOEOASFAORDIST_H_
#include <eo>
#include <moeo>
#include <cmath>
/**
Order representing Achievment scalarizing function aproach to calculate a metric
*/
template < class MOEOT>
class moeoAugmentedAchievementScalarizingFunctionDistance : public moeoObjSpaceDistance< MOEOT >
{
public:
typedef typename MOEOT::ObjectiveVector ObjectiveVector;
typedef typename MOEOT::Fitness Fitness;
/**
constructor with a normalizer
@param _rho
@param _weight the weight to apply to each dimansion
@param _normalizer the normalizer
*/
moeoAugmentedAchievementScalarizingFunctionDistance(unsigned int _rho,const ObjectiveVector &_weight,moeoObjectiveVectorNormalizer<MOEOT> &_normalizer): normalizer(_normalizer),weight(_weight),rho(_rho)
{}
/**
constructor without a normalizer
@param _rho
@param _weight the weight to apply to each dimansion
*/
moeoAugmentedAchievementScalarizingFunctionDistance(unsigned int _rho,const ObjectiveVector &_weight): normalizer(defaultNormalizer),weight(_weight),rho(_rho)
{}
/**
fonction which apply the metric to calculate a fitness
@param _reference the reference point to calculate the distance
@param _obj the point to evaluate
@return the fitness conrresponding to the distance
*/
const Fitness operator()(const ObjectiveVector &_reference,const ObjectiveVector &_obj){
unsigned int dim=_obj.size();
Fitness res=0;
Fitness max=iteration(_obj,_reference,0,_obj.minimizing(0));
for (unsigned i=0;i<dim;i++){
Fitness tmp=iteration(_obj,_reference,i,_obj.minimizing(i));
if (max<tmp)
max=tmp;
res+=tmp;
}
return res+rho*max;
}
private:
moeoObjectiveVectorNormalizer<MOEOT> defaultNormalizer;
moeoObjectiveVectorNormalizer<MOEOT> &normalizer;
const ObjectiveVector &weight;
double rho;
Fitness iteration(const ObjectiveVector &obj,const ObjectiveVector &reference,int dim,bool mini){
ObjectiveVector obj_norm=normalizer(obj);
ObjectiveVector ref_norm=normalizer(reference);
Fitness res;
if (mini){
res=obj_norm[dim]-ref_norm[dim];
}else{
res=ref_norm[dim]-obj_norm[dim];
}
res=weight[dim]*res;
return res;
}
};
#endif

102
trunk/paradiseo-moeo/src/distance/moeoAugmentedWeightedChebychevDistance.h
View file

@ -1,102 +0,0 @@
/*
* <moeoAugmentedWeightedChebychevDistance.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
* (C) OPAC Team, LIFL, 2002-2007
*
* François Legillon
* Jeremie Humeau
* 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 MOEOCHEBYCHEVORDIST_H_
#define MOEOCHEBYCHEVORDIST_H_
#include <distance/moeoObjSpaceDistance.h>
/**
order representing chebychev distance
*/
template < class MOEOT>
class moeoAugmentedWeightedChebychevDistance : public moeoObjSpaceDistance < MOEOT >
{
public:
typedef typename MOEOT::ObjectiveVector ObjectiveVector;
typedef typename MOEOT::Fitness Fitness;
/**
constructor with a normalizer
@param _rho
@param _weight the weight to apply to each dimension
@param _normalizer the normalizer
*/
moeoAugmentedWeightedChebychevDistance(unsigned int _rho, const ObjectiveVector& _weight, moeoObjectiveVectorNormalizer<MOEOT>& _normalizer): normalizer(_normalizer), weight(_weight), rho(_rho){}
/**
constructor with a dummy normalizer
@param _rho
@param _weight the weight to apply to each dimension
*/
moeoAugmentedWeightedChebychevDistance(unsigned int _rho, const ObjectiveVector& _weight): normalizer(defaultNormalizer), weight(_weight), rho(_rho){}
/**
fonction which calculate a fitness
@param _reference the reference to calculate the distance from
@param _obj the point to evaluate
@return the fitness conrresponding to the distance
*/
const Fitness operator()(const ObjectiveVector& _reference, const ObjectiveVector& _obj){
unsigned int dim=_obj.size();
Fitness res=iteration(_obj,_reference,0);
Fitness max=res*weight[0];
for (unsigned i=1;i<dim;i++){
Fitness tmp=iteration(_obj,_reference,i);
if (tmp*weight[i]>max)
max=tmp*weight[i];
res+=tmp;
}
res=res*rho+max;
return res;
}
private:
moeoObjectiveVectorNormalizer<MOEOT> &normalizer;
moeoObjectiveVectorNormalizer<MOEOT> defaultNormalizer;
const ObjectiveVector &weight;
double rho;
Fitness iteration(const ObjectiveVector &obj,const ObjectiveVector &reference,int dim){
ObjectiveVector obj_norm=normalizer(obj);
ObjectiveVector ref_norm=normalizer(reference);
Fitness res=abs(obj_norm[dim]-ref_norm[dim]);
return res;
}
};
#endif

101
trunk/paradiseo-moeo/src/distance/moeoWeightedChebychevDistance.h
View file

@ -1,101 +0,0 @@
/*
* <moeoWeightedChebychevDistance.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
* (C) OPAC Team, LIFL, 2002-2007
*
* Jeremie Humeau
* Arnaud Liefooghe
* 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 MOEOCHEBYCHEVDIST_H_
#define MOEOCHEBYCHEVDIST_H_
#include <eo>
#include <moeo>
#include <cmath>
/**
* weighted chebychev distance
*/
template < class MOEOT>
class moeoWeightedChebychevDistance : public moeoObjSpaceDistance < MOEOT >
{
public:
typedef typename MOEOT::ObjectiveVector ObjectiveVector;
typedef typename MOEOT::Fitness Fitness;
/**
* constructor with a normalizer
* @param _rho
* @param _weight the weight to apply to each dimansion
* @param _normalizer the normalizer
*/
moeoWeightedChebychevDistance(unsigned int _rho, const ObjectiveVector& _weight, moeoObjectiveVectorNormalizer<MOEOT>& _normalizer): normalizer(_normalizer), weight(_weight), rho(_rho){}
/**
* constructor with a normalizer
* @param _rho
* @param _weight the weight to apply to each dimansion
*/
moeoWeightedChebychevDistance(unsigned int _rho, const ObjectiveVector& _weight): normalizer(defaultNormalizer), weight(_weight), rho(_rho){}
/**
* fonction which apply the metric to calculate a fitness
* @param _obj the point to evaluate
* @param _reference the reference to calculate the distance from
* @return the fitness conrresponding to the distance
*/
const Fitness operator()(const ObjectiveVector& _reference, const ObjectiveVector& _obj){
unsigned int dim=_obj.size();
Fitness res=0;
ObjectiveVector obj_norm=normalizer(_obj);
ObjectiveVector ref_norm=normalizer(_reference);
for (unsigned i=0;i<dim;i++){
res+=iteration(obj_norm,ref_norm,i);
}
return res;
}
private:
moeoObjectiveVectorNormalizer<MOEOT> &normalizer;
moeoObjectiveVectorNormalizer<MOEOT> defaultNormalizer;
const ObjectiveVector &weight;
double rho;
Fitness iteration(const ObjectiveVector &obj,const ObjectiveVector &reference,int dim){
Fitness res=abs(obj[dim]-reference[dim]);
res=weight[dim]*pow(res,rho);
res=pow(res,1/rho);
return res;
}
};
#endif