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

fast computation of dominance-depth corrected for minimizing objectives

Browse source
This commit is contained in:
liefooga 2013-06-25 16:28:25 +02:00
commit 6fc4d043e0
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++)

10
moeo/test/t-moeoDominanceDepthFitnessAssignment.cpp
View file

@ -81,8 +81,8 @@ int main()
obj3[1] = 5;
obj4[0] = 5;
obj4[1] = 1;
obj5[0] = 3;
obj5[1] = 3;
obj5[0] = 4;
obj5[1] = 4;
// population
eoPop < Solution > pop;
@ -97,6 +97,10 @@ int main()
// fitness assignment
moeoDominanceDepthFitnessAssignment< Solution > fitnessAssignment;
fitnessAssignment(pop);
for (unsigned int fun=0; fun<pop.size(); fun++) {
std::cout << pop[fun].fitness() << std::endl;
}
// pop[0]
if (pop[0].fitness() != 2.0)
@ -129,7 +133,7 @@ int main()
return EXIT_FAILURE;
}
// pop[5]
if (pop[5].fitness() != 2.0)
if (pop[5].fitness() != 1.0)
{
std::cout << "ERROR (bad fitness for pop[5])" << std::endl;
return EXIT_FAILURE;