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

change '>' to '<'

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@324 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
liefooga 2007-06-19 07:53:37 +00:00
commit b3d982250a
1 changed files with 53 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

65
branches/paradiseo-moeo-1.0/src/moeoObjectiveVectorComparator.h
View file

@ -21,10 +21,45 @@
* The template argument ObjectiveVector have to be a moeoObjectiveVector. * The template argument ObjectiveVector have to be a moeoObjectiveVector.
*/ */
template < class ObjectiveVector > template < class ObjectiveVector >
class moeoObjectiveVectorComparator : public eoBF < const ObjectiveVector &, const ObjectiveVector &, bool > class moeoObjectiveVectorComparator : public eoBF < const ObjectiveVector &, const ObjectiveVector &, const bool >
{}; {};
/**
* Functor allowing to compare two objective vectors according to their first objective value, then their second, and so on.
*/
template < class ObjectiveVector >
class moeoObjectiveObjectiveVectorComparator : public moeoObjectiveVectorComparator < ObjectiveVector >
{
public:
/**
* Returns true if _objectiveVector1 < _objectiveVector2 on the first objective, then on the second, and so on
* @param _objectiveVector1 the first objective vector
* @param _objectiveVector2 the second objective vector
*/
const bool operator()(const ObjectiveVector & _objectiveVector1, const ObjectiveVector & _objectiveVector2)
{
for (unsigned i=0; i<ObjectiveVector::nObjectives(); i++)
{
if ( fabs(_objectiveVector1[i] - _objectiveVector2[i]) > ObjectiveVector::Traits::tolerance() )
{
if (_objectiveVector1[i] < _objectiveVector2[i])
{
return true;
}
else
{
return false;
}
}
}
return false;
}
};
/** /**
* This functor class allows to compare 2 objective vectors according to Pareto dominance. * This functor class allows to compare 2 objective vectors according to Pareto dominance.
*/ */
@ -34,11 +69,11 @@ class moeoParetoObjectiveVectorComparator : public moeoObjectiveVectorComparator
public: public:
/** /**
* Returns true if _objectiveVector1 dominates _objectiveVector2 * Returns true if _objectiveVector1 is dominated by _objectiveVector2
* @param _objectiveVector1 the first objective vector * @param _objectiveVector1 the first objective vector
* @param _objectiveVector2 the second objective vector * @param _objectiveVector2 the second objective vector
*/ */
bool operator()(const ObjectiveVector & _objectiveVector1, const ObjectiveVector & _objectiveVector2) const bool operator()(const ObjectiveVector & _objectiveVector1, const ObjectiveVector & _objectiveVector2)
{ {
bool dom = false; bool dom = false;
for (unsigned i=0; i<ObjectiveVector::nObjectives(); i++) for (unsigned i=0; i<ObjectiveVector::nObjectives(); i++)
@ -49,13 +84,13 @@ public:
// if the ith objective have to be minimized... // if the ith objective have to be minimized...
if (ObjectiveVector::minimizing(i)) if (ObjectiveVector::minimizing(i))
{ {
if (_objectiveVector1[i] < _objectiveVector2[i]) if (_objectiveVector1[i] > _objectiveVector2[i])
{ {
dom = true; //_objectiveVector1[i] is better than _objectiveVector2[i] dom = true; //_objectiveVector1[i] is not better than _objectiveVector2[i]
} }
else else
{ {
return false; //_objectiveVector1 cannot dominate _objectiveVector2 return false; //_objectiveVector2 cannot dominate _objectiveVector1
} }
} }
// if the ith objective have to be maximized... // if the ith objective have to be maximized...
@ -63,11 +98,11 @@ public:
{ {
if (_objectiveVector1[i] > _objectiveVector2[i]) if (_objectiveVector1[i] > _objectiveVector2[i])
{ {
dom = true; //_objectiveVector1[i] is better than _objectiveVector2[i] dom = true; //_objectiveVector1[i] is not better than _objectiveVector2[i]
} }
else else
{ {
return false; //_objectiveVector1 cannot dominate _objectiveVector2 return false; //_objectiveVector2 cannot dominate _objectiveVector1
} }
} }
} }
@ -93,27 +128,27 @@ public:
* Ctor. * Ctor.
* @param _ref the reference point * @param _ref the reference point
*/ */
moeoGDominanceObjectiveVectorComparator(ObjectiveVector _ref) : ref(_ref) moeoGDominanceObjectiveVectorComparator(ObjectiveVector & _ref) : ref(_ref)
{} {}
/** /**
* Returns true if _objectiveVector1 g-dominates _objectiveVector2. * Returns true if _objectiveVector1 is g-dominated by _objectiveVector2.
* @param _objectiveVector1 the first objective vector * @param _objectiveVector1 the first objective vector
* @param _objectiveVector2 the second objective vector * @param _objectiveVector2 the second objective vector
*/ */
bool operator()(const ObjectiveVector & _objectiveVector1, const ObjectiveVector & _objectiveVector2) const bool operator()(const ObjectiveVector & _objectiveVector1, const ObjectiveVector & _objectiveVector2)
{ {
unsigned flag1 = flag(_objectiveVector1); unsigned flag1 = flag(_objectiveVector1);
unsigned flag2 = flag(_objectiveVector2); unsigned flag2 = flag(_objectiveVector2);
if (flag1==0) if (flag2==0)
{ {
// cannot dominate // cannot dominate
return false; return false;
} }
else if ( (flag1==1) && (flag2==0) ) else if ( (flag2==1) && (flag1==0) )
{ {
// dominates // is dominated
return true; return true;
} }
else // (flag1==1) && (flag2==1) else // (flag1==1) && (flag2==1)
@ -127,7 +162,7 @@ public:
private: private:
/** the reference point */ /** the reference point */
ObjectiveVector ref; ObjectiveVector & ref;
/** Pareto comparator */ /** Pareto comparator */
moeoParetoObjectiveVectorComparator < ObjectiveVector > paretoComparator; moeoParetoObjectiveVectorComparator < ObjectiveVector > paretoComparator;