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

Changed a few things so that the python library can

Browse source 
be used with the multi-objective library (it basically
boils down to removing the assumption that fitness() has a
size() member function and changing eoPop<DummyEO> to vector<DummyEO>)
This commit is contained in:
maartenkeijzer 2003-01-06 14:25:40 +00:00
commit 3267a34191
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
eo/src/eoNDSorting.h
View file

@ -31,6 +31,7 @@
#include <algorithm> #include <algorithm>
#include <eoPop.h> #include <eoPop.h>
#include <eoPerf2Worth.h> #include <eoPerf2Worth.h>
#include <cassert>
/** /**
Non dominated sorting, it *is a* vector of doubles, the integer part is the rank (to which front it belongs), Non dominated sorting, it *is a* vector of doubles, the integer part is the rank (to which front it belongs),
@ -90,8 +91,8 @@ private :
void one_objective(const eoPop<EOT>& _pop) void one_objective(const eoPop<EOT>& _pop)
{ {
unsigned i; unsigned i;
eoPop<DummyEO> tmp_pop; vector<DummyEO> tmp_pop;
tmp_pop.resize(_pop.size()); tmp_pop.resize(_pop.size());
// copy pop to dummy population (only need the fitnesses) // copy pop to dummy population (only need the fitnesses)
@ -101,10 +102,10 @@ private :
tmp_pop[i].index = i; tmp_pop[i].index = i;
} }
// sort it // sort it in ascending
tmp_pop.sort(); sort(tmp_pop.begin(), tmp_pop.end(), greater<DummyEO>() );
//
for (i = 0; i < _pop.size(); ++i) for (i = 0; i < _pop.size(); ++i)
{ {
value()[tmp_pop[i].index] = _pop.size() - i; // set rank value()[tmp_pop[i].index] = _pop.size() - i; // set rank
@ -438,10 +439,12 @@ class eoNDSorting_II : public eoNDSorting<EOT>
/// _cf points into the elements that consist of the current front /// _cf points into the elements that consist of the current front
vector<double> niche_penalty(const vector<unsigned>& _cf, const eoPop<EOT>& _pop) vector<double> niche_penalty(const vector<unsigned>& _cf, const eoPop<EOT>& _pop)
{ {
typedef typename EOT::Fitness::fitness_traits traits;
unsigned i; unsigned i;
vector<double> niche_count(_cf.size(), 0.); vector<double> niche_count(_cf.size(), 0.);
unsigned nObjectives = _pop[_cf[0]].fitness().size();
unsigned nObjectives = traits::nObjectives(); //_pop[_cf[0]].fitness().size();
for (unsigned o = 0; o < nObjectives; ++o) for (unsigned o = 0; o < nObjectives; ++o)
{ {
@ -470,14 +473,12 @@ class eoNDSorting_II : public eoNDSorting<EOT>
for (i = 0; i < nc.size(); ++i) for (i = 0; i < nc.size(); ++i)
{ {
niche_count[i] = (max_dist + 1) - nc[i]; niche_count[i] = (max_dist + 1 - nc[i]);
} }
} }
return niche_count; return niche_count;
} }
}; };
#endif #endif