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

Changed some bug in never-used-except-in-make_algo_easea.h file

Browse source 
(probably some change in the compiler made this stop working ???)
This commit is contained in:
evomarc 2006-01-02 14:09:22 +00:00
commit 116f21f182
1 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
eo/src/eoReduceSplit.h
View file

@ -221,7 +221,8 @@ public:
} }
/** Performs repeated inverse_deterministic_tournament on the pop */ /** Performs repeated inverse_deterministic_tournament on the pop */
void operator()(eoPop<EOT>& _newgen, unsigned _newsize) void operator()(eoPop<EOT>& _newgen, eoPop<EOT> & _eliminated)
// BUG??? void operator()(eoPop<EOT>& _newgen, unsigned _newsize)
{ {
unsigned popSize = _newgen.size(); unsigned popSize = _newgen.size();
unsigned eliminated = howMany(popSize); unsigned eliminated = howMany(popSize);
@ -276,15 +277,30 @@ public:
} }
/** Performs repeated inverse_stochastic_tournament on the pop */ /** Performs repeated inverse_stochastic_tournament on the pop */
void operator()(eoPop<EOT>& _newgen, unsigned _newsize) void operator()(eoPop<EOT>& _newgen, eoPop<EOT> & _eliminated)
//BUG??? void operator()(eoPop<EOT>& _newgen, unsigned _newsize)
{ {
/* old version
if (!_eliminated.size()) // nothing to do if (!_eliminated.size()) // nothing to do
return; return;
unsigned oldSize = _newgen.size(); unsigned oldSize = _newgen.size();
unsigned newSize = oldSize - _eliminated.size(); unsigned newSize = oldSize - _eliminated.size();
unsigned eliminated = howMany(popSize);
if (newSize < 0) if (newSize < 0)
throw std::logic_error("eoStochTournamentTruncateSplit: Cannot truncate to a larger size!\n"); throw std::logic_error("eoStochTournamentTruncateSplit: Cannot truncate to a larger size!\n");
end of old version */
unsigned popSize = _newgen.size();
unsigned eliminated = howMany(popSize);
if (!eliminated) // nothing to do
return ;
unsigned newsize = popSize - eliminated;
if (newsize < 0)
throw std::logic_error("eoDetTournamentTruncateSplit: Cannot truncate to a larger size!\n");
_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++)
{ {