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

added typenames for pop::iterator

Browse source
This commit is contained in:
maartenkeijzer 2003-03-02 11:26:45 +00:00
commit e5c83ac2e8
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
eo/src/eoMGGReplacement.h
View file

@ -73,7 +73,7 @@ public:
throw std::runtime_error("Not enough parents killed in eoMGGReplacement"); throw std::runtime_error("Not enough parents killed in eoMGGReplacement");
// select best offspring // select best offspring
eoPop<EOT>::iterator it = _offspring.it_best_element(); typename eoPop<EOT>::iterator it = _offspring.it_best_element();
// add to parents // add to parents
_parents.push_back(*it); _parents.push_back(*it);
// remove from offspring // remove from offspring

8
eo/src/eoReduceSplit.h
View file

@ -107,7 +107,7 @@ public:
_eliminated.reserve(_eliminated.size()+eliminated); //in case not empty? _eliminated.reserve(_eliminated.size()+eliminated); //in case not empty?
for (unsigned i=0; i<eliminated; i++) for (unsigned i=0; i<eliminated; i++)
{ {
eoPop<EOT>::iterator it = _newgen.it_worse_element(); typename eoPop<EOT>::iterator it = _newgen.it_worse_element();
if (returnEliminated) if (returnEliminated)
_eliminated.push_back(*it); _eliminated.push_back(*it);
_newgen.erase(it); _newgen.erase(it);
@ -184,7 +184,7 @@ public:
for (unsigned i=0; i<eliminated; i++) for (unsigned i=0; i<eliminated; i++)
{ {
unsigned loser=random(_newgen.size()); unsigned loser=random(_newgen.size());
eoPop<EOT>::iterator it = _newgen.begin()+loser; typename eoPop<EOT>::iterator it = _newgen.begin()+loser;
if (returnEliminated) if (returnEliminated)
_eliminated.push_back(*it); _eliminated.push_back(*it);
_newgen.erase(it); _newgen.erase(it);
@ -235,7 +235,7 @@ public:
_eliminated.reserve(_eliminated.size()+eliminated); //in case not empty? _eliminated.reserve(_eliminated.size()+eliminated); //in case not empty?
for (unsigned i=0; i<eliminated; i++) for (unsigned i=0; i<eliminated; i++)
{ {
eoPop<EOT>::iterator it = inverse_deterministic_tournament(_newgen.begin(), _newgen.end(), t_size); typename eoPop<EOT>::iterator it = inverse_deterministic_tournament(_newgen.begin(), _newgen.end(), t_size);
if (returnEliminated) if (returnEliminated)
_eliminated.push_back(*it); _eliminated.push_back(*it);
_newgen.erase(it); _newgen.erase(it);
@ -288,7 +288,7 @@ public:
_eliminated.reserve(_eliminated.size()+eliminated); //in case not empty? _eliminated.reserve(_eliminated.size()+eliminated); //in case not empty?
for (unsigned i=0; i<_eliminated.size(); i++) for (unsigned i=0; i<_eliminated.size(); i++)
{ {
eoPop<EOT>::iterator it = inverse_stochastic_tournament(_newgen.begin(), _newgen.end(), t_rate); typename eoPop<EOT>::iterator it = inverse_stochastic_tournament(_newgen.begin(), _newgen.end(), t_rate);
if (returnEliminated) if (returnEliminated)
_eliminated.push_back(*it); _eliminated.push_back(*it);
_newgen.erase(it); _newgen.erase(it);