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

decorated sort and max with std:: specifier

Browse source
This commit is contained in:
maartenkeijzer 2003-03-02 11:35:43 +00:00
commit 33fae18bdd
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
eo/src/eoNDSorting.h
View file

@ -141,7 +141,7 @@ private :
sort1[i] = i;
}
sort(sort1.begin(), sort1.end(), Sorter(_pop));
std::sort(sort1.begin(), sort1.end(), Sorter(_pop));
// Ok, now the meat of the algorithm
@ -150,7 +150,7 @@ private :
double max1 = -1e+20;
for (i = 0; i < _pop.size(); ++i)
{
max1 = max(max1, _pop[i].fitness()[1]);
max1 = std::max(max1, _pop[i].fitness()[1]);
}
max1 = max1 + 1.0; // add a bit to it so that it is a real upperbound
@ -452,7 +452,7 @@ class eoNDSorting_II : public eoNDSorting<EOT>
performance[i].second = i;
}
sort(performance.begin(), performance.end(), compare_nodes()); // a lambda operator would've been nice here
std::sort(performance.begin(), performance.end(), compare_nodes()); // a lambda operator would've been nice here
std::vector<double> nc(niche_count.size(), 0.0);

2
eo/src/eoPerf2Worth.h
View file

@ -164,7 +164,7 @@ class eoPerf2WorthCached : public eoPerf2Worth<EOT, WorthT>
indices[i] = i;
}
sort(indices.begin(), indices.end(), eoPerf2Worth<EOT,WorthT>::compare_worth(value()));
std::sort(indices.begin(), indices.end(), eoPerf2Worth<EOT,WorthT>::compare_worth(value()));
eoPop<EOT> tmp_pop;
tmp_pop.resize(_pop.size());