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

add an assert to check if parents size <= offspring size when using eoCommaReplacement

Browse source 
This may be more explicit than the exception thrown in eoTruncate.
This commit is contained in:
nojhan 2012-07-06 21:40:28 +02:00
commit 51632cf856
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
eo/src/eoMergeReduce.h
View file

@ -55,7 +55,7 @@ class eoMergeReduce : public eoReplacement<EOT>
merge(_merge), reduce(_reduce) merge(_merge), reduce(_reduce)
{} {}
void operator()(eoPop<EOT>& _parents, eoPop<EOT>& _offspring) virtual void operator()(eoPop<EOT>& _parents, eoPop<EOT>& _offspring)
{ {
merge(_parents, _offspring); // parents untouched, result in offspring merge(_parents, _offspring); // parents untouched, result in offspring
reduce(_offspring, _parents.size()); reduce(_offspring, _parents.size());
@ -92,6 +92,14 @@ class eoCommaReplacement : public eoMergeReduce<EOT>
public : public :
eoCommaReplacement() : eoMergeReduce<EOT>(no_elite, truncate) {} eoCommaReplacement() : eoMergeReduce<EOT>(no_elite, truncate) {}
virtual void operator()(eoPop<EOT>& _parents, eoPop<EOT>& _offspring)
{
// There must be more offsprings than parents, or else an exception will be raised
assert( _offspring.size() >= _parents.size() );
eoMergeReduce<EOT>::operator()( _parents, _offspring );
}
private : private :
eoNoElitism<EOT> no_elite; eoNoElitism<EOT> no_elite;
eoTruncate<EOT> truncate; eoTruncate<EOT> truncate;