Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/paradiseo/paradiseo

This commit is contained in:
verel 2014-11-09 15:18:17 +01:00
commit 5d43212118

View file

@ -98,11 +98,11 @@ public:
// if _o2 is dominated by _o1
if ( paretoComparator(_o2,_o1) )
{
result = - hypervolume(_o1, _o2, ObjectiveVector::Traits::nObjectives()-1);
result = - hypervolume(o1, o2, ObjectiveVector::Traits::nObjectives()-1);
}
else
{
result = hypervolume(_o2, _o1, ObjectiveVector::Traits::nObjectives()-1);
result = hypervolume(o2, o1, ObjectiveVector::Traits::nObjectives()-1);
}
return result;
}