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

add distance

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@345 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
liefooga 2007-06-21 14:28:32 +00:00
commit f2c7c06651
2 changed files with 81 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

84
branches/paradiseo-moeo-1.0/src/distance/moeoDistance.h
View file

@ -26,13 +26,13 @@ class moeoDistance : public eoBF < const MOEOT &, const MOEOT &, const Type >
public: public:
/** /**
* Nothing to do * Nothing to do
* @param _pop the population * @param _pop the population
*/ */
virtual void setup(const eoPop < MOEOT > & _pop) virtual void setup(const eoPop < MOEOT > & _pop)
{} {}
/** /**
* Nothing to do * Nothing to do
* @param _min lower bound * @param _min lower bound
@ -43,14 +43,14 @@ public:
{} {}
/** /**
* Nothing to do * Nothing to do
* @param _realInterval the eoRealInterval object * @param _realInterval the eoRealInterval object
* @param _obj the objective index * @param _obj the objective index
*/ */
virtual void setup(eoRealInterval _realInterval, unsigned _obj) virtual void setup(eoRealInterval _realInterval, unsigned _obj)
{} {}
}; };
@ -62,7 +62,7 @@ class moeoNormalizedDistance : public moeoDistance < MOEOT , Type >
{ {
public: public:
/** the objective vector type of the solutions */ /** the objective vector type of the solutions */
typedef typename MOEOT::ObjectiveVector ObjectiveVector; typedef typename MOEOT::ObjectiveVector ObjectiveVector;
@ -84,7 +84,7 @@ public:
*/ */
static double tiny() static double tiny()
{ {
return 1e-6; return 1e-6;
} }
@ -110,12 +110,12 @@ public:
} }
/** /**
* Sets the lower bound (_min) and the upper bound (_max) for the objective _obj * Sets the lower bound (_min) and the upper bound (_max) for the objective _obj
* @param _min lower bound * @param _min lower bound
* @param _max upper bound * @param _max upper bound
* @param _obj the objective index * @param _obj the objective index
*/ */
virtual void setup(double _min, double _max, unsigned _obj) virtual void setup(double _min, double _max, unsigned _obj)
{ {
if (_min == _max) if (_min == _max)
@ -127,11 +127,11 @@ public:
} }
/** /**
* Sets the lower bound and the upper bound for the objective _obj using a eoRealInterval object * Sets the lower bound and the upper bound for the objective _obj using a eoRealInterval object
* @param _realInterval the eoRealInterval object * @param _realInterval the eoRealInterval object
* @param _obj the objective index * @param _obj the objective index
*/ */
virtual void setup(eoRealInterval _realInterval, unsigned _obj) virtual void setup(eoRealInterval _realInterval, unsigned _obj)
{ {
bounds[_obj] = _realInterval; bounds[_obj] = _realInterval;
@ -155,24 +155,24 @@ class moeoEuclideanDistance : public moeoNormalizedDistance < MOEOT >
{ {
public: public:
/** the objective vector type of the solutions */ /** the objective vector type of the solutions */
typedef typename MOEOT::ObjectiveVector ObjectiveVector; typedef typename MOEOT::ObjectiveVector ObjectiveVector;
/** /**
* Returns the euclidian distance between _moeo1 and _moeo2 in the objective space * Returns the euclidian distance between _moeo1 and _moeo2 in the objective space
* @param _moeo1 the first solution * @param _moeo1 the first solution
* @param _moeo2 the second solution * @param _moeo2 the second solution
*/ */
const double operator()(const MOEOT & _moeo1, const MOEOT & _moeo2) const double operator()(const MOEOT & _moeo1, const MOEOT & _moeo2)
{ {
double result = 0.0; double result = 0.0;
double tmp1, tmp2; double tmp1, tmp2;
for (unsigned i=0; i<ObjectiveVector::nObjectives(); i++) for (unsigned i=0; i<ObjectiveVector::nObjectives(); i++)
{ {
tmp1 = (_moeo1.objectiveVector()[i] - bounds[i].minimum()) / bounds[i].range(); tmp1 = (_moeo1.objectiveVector()[i] - bounds[i].minimum()) / bounds[i].range();
tmp2 = (_moeo2.objectiveVector()[i] - bounds[i].minimum()) / bounds[i].range(); tmp2 = (_moeo2.objectiveVector()[i] - bounds[i].minimum()) / bounds[i].range();
result += (tmp1-tmp2) * (tmp1-tmp2); result += (tmp1-tmp2) * (tmp1-tmp2);
} }
return sqrt(result); return sqrt(result);
} }
@ -194,24 +194,24 @@ class moeoManhattanDistance : public moeoNormalizedDistance < MOEOT >
{ {
public: public:
/** the objective vector type of the solutions */ /** the objective vector type of the solutions */
typedef typename MOEOT::ObjectiveVector ObjectiveVector; typedef typename MOEOT::ObjectiveVector ObjectiveVector;
/** /**
* Returns the Manhattan distance between _moeo1 and _moeo2 in the objective space * Returns the Manhattan distance between _moeo1 and _moeo2 in the objective space
* @param _moeo1 the first solution * @param _moeo1 the first solution
* @param _moeo2 the second solution * @param _moeo2 the second solution
*/ */
const double operator()(const MOEOT & _moeo1, const MOEOT & _moeo2) const double operator()(const MOEOT & _moeo1, const MOEOT & _moeo2)
{ {
double result = 0.0; double result = 0.0;
double tmp1, tmp2; double tmp1, tmp2;
for (unsigned i=0; i<ObjectiveVector::nObjectives(); i++) for (unsigned i=0; i<ObjectiveVector::nObjectives(); i++)
{ {
tmp1 = (_moeo1.objectiveVector()[i] - bounds[i].minimum()) / bounds[i].range(); tmp1 = (_moeo1.objectiveVector()[i] - bounds[i].minimum()) / bounds[i].range();
tmp2 = (_moeo2.objectiveVector()[i] - bounds[i].minimum()) / bounds[i].range(); tmp2 = (_moeo2.objectiveVector()[i] - bounds[i].minimum()) / bounds[i].range();
result += fabs(tmp1-tmp2); result += fabs(tmp1-tmp2);
} }
return result; return result;
} }

78
branches/paradiseo-moeo-1.0/src/distance/moeoDistanceMatrix.h
View file

@ -17,58 +17,58 @@
#include <distance/moeoDistance.h> #include <distance/moeoDistance.h>
/** /**
* A matrix to compute distances between every pair of individuals contained in a population. * A matrix to compute distances between every pair of individuals contained in a population.
*/ */
template < class MOEOT , class Type > template < class MOEOT , class Type >
class moeoDistanceMatrix : public eoUF < const eoPop < MOEOT > &, void > , public std::vector< std::vector < Type > > class moeoDistanceMatrix : public eoUF < const eoPop < MOEOT > &, void > , public std::vector< std::vector < Type > >
{ {
public: public:
using std::vector< std::vector < Type > > :: size; using std::vector< std::vector < Type > > :: size;
using std::vector< std::vector < Type > > :: operator[]; using std::vector< std::vector < Type > > :: operator[];
/** /**
* Ctor * Ctor
* @param _size size for every dimension of the matrix * @param _size size for every dimension of the matrix
* @param _distance the distance to use * @param _distance the distance to use
*/ */
moeoDistanceMatrix (unsigned _size, moeoDistance < MOEOT , Type > & _distance) : distance(_distance) moeoDistanceMatrix (unsigned _size, moeoDistance < MOEOT , Type > & _distance) : distance(_distance)
{
this->resize(_size);
for(unsigned i=0; i<_size; i++)
{
this->operator[](i).resize(_size);
}
}
/**
* Sets the distance between every pair of individuals contained in the population _pop
* @param _pop the population
*/
void operator()(const eoPop < MOEOT > & _pop)
{ {
// 1 - setup the bounds (if necessary) this->resize(_size);
distance.setup(_pop); for (unsigned i=0; i<_size; i++)
// 2 - compute distances {
this->operator[](0).operator[](0) = Type(); this->operator[](i).resize(_size);
for (unsigned i=0; i<size(); i++) }
{ }
this->operator[](i).operator[](i) = Type();
for (unsigned j=0; j<i; j++)
{ /**
this->operator[](i).operator[](j) = distance(_pop[i], _pop[j]); * Sets the distance between every pair of individuals contained in the population _pop
this->operator[](j).operator[](i) = this->operator[](i).operator[](j); * @param _pop the population
} */
} void operator()(const eoPop < MOEOT > & _pop)
{
// 1 - setup the bounds (if necessary)
distance.setup(_pop);
// 2 - compute distances
this->operator[](0).operator[](0) = Type();
for (unsigned i=0; i<size(); i++)
{
this->operator[](i).operator[](i) = Type();
for (unsigned j=0; j<i; j++)
{
this->operator[](i).operator[](j) = distance(_pop[i], _pop[j]);
this->operator[](j).operator[](i) = this->operator[](i).operator[](j);
}
}
} }
private: private:
/** the distance to use */ /** the distance to use */
moeoDistance < MOEOT , Type > & distance; moeoDistance < MOEOT , Type > & distance;
}; };