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

Use the feasibility of the current individual for the feasability of the metric in dual fitness assignment

Browse source
This commit is contained in:
Johann Dreo 2013-06-21 11:09:15 +02:00
commit 3d0db369bc
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
moeo/src/fitness/moeoExpBinaryIndicatorBasedDualFitnessAssignment.h
View file

@ -130,7 +130,10 @@ protected:
metric( pop[i].objectiveVector(), pop[j].objectiveVector() ), metric( pop[i].objectiveVector(), pop[j].objectiveVector() ),
pop[i].objectiveVector().is_feasible() pop[i].objectiveVector().is_feasible()
); );
} // if i != j } else { // if i != j
assert( i == j );
values[i][j] = Type( 0.0, pop[i].objectiveVector().is_feasible() );
}
} // for j in pop } // for j in pop
} // for i in pop } // for i in pop
} }
@ -145,15 +148,14 @@ protected:
virtual Type computeFitness(const unsigned int _idx) virtual Type computeFitness(const unsigned int _idx)
{ {
Type result( 0.0, values[_idx][_idx].is_feasible() ); // Type result( 0.0, values[_idx][_idx].is_feasible() );
for (unsigned int i=0; i<values.size(); i++) Type result( 0.0, values[_idx][_idx].is_feasible() );
{ for (unsigned int i=0; i<values.size(); i++) {
if (i != _idx) if (i != _idx) {
{ result -= exp(-values[i][_idx]/kappa);
result -= exp(-values[i][_idx]/kappa);
} }
} }
return result; return result;
} }