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

Warning removed

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1630 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2009-12-14 16:49:28 +00:00
commit ca19a9bfc7
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
trunk/paradiseo-moeo/src/utils/moeoObjectiveVectorNormalizer.h
View file

@ -2,7 +2,7 @@
* <moeoObjectiveVectorNormalizer.h> * <moeoObjectiveVectorNormalizer.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2009 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2009
* *
* Legillon François * Legillon François
* *
* *
* This software is governed by the CeCILL license under French law and * This software is governed by the CeCILL license under French law and
@ -39,11 +39,11 @@
#define MOEOOBJVECNORM_H_ #define MOEOOBJVECNORM_H_
#include <eoPop.h> #include <eoPop.h>
#include <utils/eoRealBounds.h> #include <utils/eoRealBounds.h>
/** /**
class to normalize each dimension of objectiveVectors class to normalize each dimension of objectiveVectors
*/ */
template <class MOEOT> template <class MOEOT>
class moeoObjectiveVectorNormalizer class moeoObjectiveVectorNormalizer
{ {
public: public:
typedef typename MOEOT::ObjectiveVector ObjectiveVector; typedef typename MOEOT::ObjectiveVector ObjectiveVector;
@ -75,7 +75,7 @@ class moeoObjectiveVectorNormalizer
moeoObjectiveVectorNormalizer(std::vector<Bounds> &_boundaries, Type max_param=100):scale(make_scale_from_bounds(_boundaries,max_param)), max(max_param) moeoObjectiveVectorNormalizer(std::vector<Bounds> &_boundaries, Type max_param=100):scale(make_scale_from_bounds(_boundaries,max_param)), max(max_param)
{} {}
/** /**
constructor to create a normalizer from bounds constructor to create a normalizer from bounds
@param _bounds the supplied vectors should have their value in those bounds @param _bounds the supplied vectors should have their value in those bounds
@param max_param the returned values will be between 0 and max @param max_param the returned values will be between 0 and max
**/ **/
@ -90,7 +90,7 @@ class moeoObjectiveVectorNormalizer
moeoObjectiveVectorNormalizer(const ObjectiveVector &_best,const ObjectiveVector &_worst, Type max_param=100 ):scale(make_scale_from_minmax(_best,_worst,max_param)), max(max_param) moeoObjectiveVectorNormalizer(const ObjectiveVector &_best,const ObjectiveVector &_worst, Type max_param=100 ):scale(make_scale_from_minmax(_best,_worst,max_param)), max(max_param)
{} {}
/** /**
* Creates a scale which can be used in conjonction with a normalizer * Creates a scale which can be used in conjonction with a normalizer
* @param _pop the population to analyse * @param _pop the population to analyse
@ -126,12 +126,12 @@ class moeoObjectiveVectorNormalizer
std::vector<Type> coefs; std::vector<Type> coefs;
if(!max_param){ if(!max_param){
// std::cout<<"ampmax="<<amp_max; // std::cout<<"ampmax="<<amp_max;
if(amps[i]==0) std::cout<<"scale erronée"<<std::endl; // if(amps[i]==0) std::cerr<<"scale erronée"<<std::endl;
coefs.push_back(amps[i]==0?1:amp_max/amps[i]); coefs.push_back(amps[i]==0?1:amp_max/amps[i]);
} }
else{ else{
// std::cout<<"maxparam="<<max_param; // std::cout<<"maxparam="<<max_param;
if(amps[i]==0) std::cout<<"scale erronée"<<std::endl; // if(amps[i]==0) std::cerr<<"scale erronée"<<std::endl;
coefs.push_back(amps[i]==0?1:max_param/amps[i]); coefs.push_back(amps[i]==0?1:max_param/amps[i]);
} }
@ -265,13 +265,13 @@ class moeoObjectiveVectorNormalizer
scale=make_scale_from_minmax(_min,_max,max); scale=make_scale_from_minmax(_min,_max,max);
} }
/** change the scale according to given boundaries /** change the scale according to given boundaries
@param boundaries a vector of bounds corresponding to the bounds in each dimension @param boundaries a vector of bounds corresponding to the bounds in each dimension
*/ */
void update_by_bounds(const std::vector<Bounds> &boundaries){ void update_by_bounds(const std::vector<Bounds> &boundaries){
scale=make_scale_from_bounds(boundaries); scale=make_scale_from_bounds(boundaries);
} }
/** change the scale according to bounds,them same is used in each dimension /** change the scale according to bounds,them same is used in each dimension
@param bounds bounds corresponding to the bounds in each dimension @param bounds bounds corresponding to the bounds in each dimension
*/ */
void update_by_bounds(const Bounds &bounds){ void update_by_bounds(const Bounds &bounds){
@ -279,7 +279,7 @@ class moeoObjectiveVectorNormalizer
} }
/** /**
updates the scale updates the scale
@param _scale the new scale @param _scale the new scale
*/ */