looking for a bug in eoInsertion
This commit is contained in:
parent
2141b13f9d
commit
204b0bcac8
3 changed files with 32 additions and 40 deletions
|
|
@ -9,9 +9,13 @@
|
|||
|
||||
#include <eo>
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// eoInsertion
|
||||
//-----------------------------------------------------------------------------
|
||||
/******************************************************************************
|
||||
* eoInsertion: A replacement algorithm.
|
||||
* Takes two populations: breeders and original populations. At the en of the
|
||||
* process, the original population has chenge in the followin way:
|
||||
* (1) the worst individuals haa been erased
|
||||
* (2) the best individuals from the breeders has been added
|
||||
*****************************************************************************/
|
||||
|
||||
template<class Chrom> class eoInsertion: public eoMerge<Chrom>
|
||||
{
|
||||
|
|
@ -19,26 +23,25 @@ template<class Chrom> class eoInsertion: public eoMerge<Chrom>
|
|||
/// (Default) Constructor.
|
||||
eoInsertion(const float& _rate = 1.0): eoMerge(_rate) {}
|
||||
|
||||
///
|
||||
/// @param breeders
|
||||
/// @param pop
|
||||
/**
|
||||
* Creates a new population based on breeders and original population
|
||||
* @param breeders The population of breeders.
|
||||
* @param pop The original population.
|
||||
*/
|
||||
void operator()(const eoPop<Chrom>& breeders, eoPop<Chrom>& pop)
|
||||
{
|
||||
cout << pop << endl;
|
||||
|
||||
sort(pop.begin(), pop.end());
|
||||
|
||||
cout << pop << endl;
|
||||
|
||||
cout << "cte = "
|
||||
<< (int)(pop.size() * (rate() - 1) - breeders.size()) << endl;
|
||||
|
||||
pop.erase(pop.end() + (int)(pop.size() * (rate() - 1) - breeders.size()),
|
||||
pop.end());
|
||||
|
||||
cout << "cte = "
|
||||
<< (int)(pop.size() * (rate() - 1) - breeders.size()) << endl;
|
||||
|
||||
if (rated() > 1)
|
||||
pop.erase(pop.end() +
|
||||
(int)(pop.size() * (rate() - 1) - breeders.size()),
|
||||
pop.end());
|
||||
else
|
||||
{
|
||||
cout << "eoInsertion no funciona con rate < 1"
|
||||
exit(1);
|
||||
}
|
||||
|
||||
copy(breeders.begin(), breeders.end(),
|
||||
back_insert_iterator<eoPop<Chrom> >(pop));
|
||||
}
|
||||
|
|
|
|||
Reference in a new issue