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

Add to AsyncMig with peoData

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@897 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
canape 2008-01-21 10:24:37 +00:00
commit 8c8751f367
4 changed files with 172 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

28
trunk/paradiseo-peo/src/peoAsyncIslandMig.h
View file

@ -46,9 +46,6 @@
#include <eoReplacement.h>
#include <eoPop.h>
#include <peoData.h>
#include <continuator.h>
#include "core/messaging.h"
#include "core/eoPop_mesg.h"
@ -159,8 +156,8 @@ template< class EOT, class TYPE > class peoAsyncIslandMig : public Cooperative,
//! @param eoPop< EOT >& __destination - destination population in which the immigrant population are integrated.
peoAsyncIslandMig(
continuator & __cont,
eoSelect< EOT >& __select,
eoReplacement< EOT >& __replace,
selector <TYPE> & __select,
replacement <TYPE> & __replace,
Topology& __topology,
peoData & __source,
peoData & __destination
@ -190,8 +187,8 @@ template< class EOT, class TYPE > class peoAsyncIslandMig : public Cooperative,
private:
continuator & cont; // continuator
eoSelect< EOT >& select; // the selection strategy
eoReplacement< EOT >& replace; // the replacement strategy
selector <TYPE> & select; // the selection strategy
replacement <TYPE> & replace; // the replacement strategy
Topology& topology; // the neighboring topology
peoData & source;
peoData & destination;
@ -204,8 +201,8 @@ template< class EOT, class TYPE > class peoAsyncIslandMig : public Cooperative,
template< class EOT , class TYPE> peoAsyncIslandMig< EOT, TYPE > :: peoAsyncIslandMig(
continuator & __cont,
eoSelect< EOT >& __select,
eoReplacement< EOT >& __replace,
selector <TYPE> & __select,
replacement <TYPE> & __replace,
Topology& __topology,
peoData & __source,
peoData & __destination
@ -249,7 +246,7 @@ template< class EOT , class TYPE> void peoAsyncIslandMig< EOT , TYPE> :: emigrat
{
TYPE mig;
//select( source, mig );
select(mig);
em.push( mig );
coop_em.push( out[i] );
send( out[i] );
@ -266,8 +263,7 @@ template< class EOT , class TYPE> void peoAsyncIslandMig< EOT , TYPE> :: immigra
while ( !imm.empty() )
{
// replace( destination, imm.front() );
replace(imm.front() );
imm.pop();
printDebugMessage( "receiving some immigrants." );
}
@ -278,14 +274,6 @@ template< class EOT , class TYPE> void peoAsyncIslandMig< EOT , TYPE> :: immigra
template< class EOT , class TYPE> void peoAsyncIslandMig< EOT, TYPE > :: operator()()
{
/*
if ( !cont( source ) && ! eocont(source) )
{
emigrate(); // sending emigrants
immigrate(); // receiving immigrants
}
*/
if (cont.check())
{