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

Merge branch 'master' of https://gforge.inria.fr/git/paradiseo/paradiseo

Browse source
This commit is contained in:
Johann Dreo 2013-09-18 10:32:46 +02:00
commit 51a1af0924
2 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
moeo/src/fitness/moeoDominanceDepthFitnessAssignment.h
View file

@ -155,7 +155,10 @@ private:
*/
bool operator()(const MOEOT & _moeo1, const MOEOT & _moeo2)
{
return cmp(_moeo2.objectiveVector(), _moeo1.objectiveVector());
if (MOEOT::ObjectiveVector::maximizing(0))
return cmp(_moeo2.objectiveVector(), _moeo1.objectiveVector());
else
return cmp(_moeo1.objectiveVector(), _moeo2.objectiveVector());
}
private:
/** the corresponding comparator for objective vectors */
@ -207,6 +210,17 @@ private:
moeoPtrComparator<MOEOT> cmp(objComparator);
std::sort(sortedptrpop.begin(), sortedptrpop.end(), cmp);
//
std::cout << std::endl << "sorted pop" << std::endl;
std::cout << "====================" << std::endl;
for(unsigned int i=0; i<_pop.size(); i++)
{
std::cout << i << " : " << (*sortedptrpop[i]) << std::endl;
}
std::cout << "====================" << std::endl;
//
// compute an upper bound on the second objective (1)
double max_obj1 = std::numeric_limits<double>::min();
for(unsigned int i=0; i<_pop.size(); i++)