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

peoPopEval.h modified

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1005 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
canape 2008-02-26 08:53:48 +00:00
commit b1175c10ab
1 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

31
trunk/paradiseo-peo/src/peoPopEval.h
View file

@ -153,20 +153,23 @@ template< class EOT > void peoPopEval< EOT >::operator()(eoPop< EOT >& __dummy,
template< class EOT > void peoPopEval< EOT >::operator()(eoPop< EOT >& __pop )
{
for ( unsigned i = 0; i < __pop.size(); i++ )
{
__pop[ i ].fitness(typename EOT :: Fitness() );
progression[ &__pop[ i ] ].first = funcs.size() - 1;
progression[ &__pop[ i ] ].second = funcs.size();
for ( unsigned j = 0; j < funcs.size(); j++ )
{
/* Queuing the 'invalid' solution and its associated owner */
tasks.push( &__pop[ i ] );
}
}
total = funcs.size() * __pop.size();
requestResourceRequest( funcs.size() * __pop.size() );
stop();
if ( __pop.size() && (funcs.size() * __pop.size()) )
{
for ( unsigned i = 0; i < __pop.size(); i++ )
{
__pop[ i ].fitness(typename EOT :: Fitness() );
progression[ &__pop[ i ] ].first = funcs.size() - 1;
progression[ &__pop[ i ] ].second = funcs.size();
for ( unsigned j = 0; j < funcs.size(); j++ )
{
/* Queuing the 'invalid' solution and its associated owner */
tasks.push( &__pop[ i ] );
}
}
total = funcs.size() * __pop.size();
requestResourceRequest( funcs.size() * __pop.size() );
stop();
}
}