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

Add to SyncMig with peoData

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@899 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
canape 2008-01-21 13:44:17 +00:00
commit c775354e77
5 changed files with 156 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

53
trunk/paradiseo-peo/src/peoData.h
View file

@ -40,8 +40,9 @@
#include "core/eoVector_mesg.h" #include "core/eoVector_mesg.h"
#include "core/messaging.h" #include "core/messaging.h"
/**************************************************************************************/
/************************** DEFINE A DATA ******************************************/ /************************** DEFINE A DATA ******************************************/
/**************************************************************************************/
class peoData { class peoData {
public: public:
@ -51,6 +52,9 @@ public:
}; };
// Specific implementation : migration of a population
template<class EOT> template<class EOT>
class peoPop: public eoPop<EOT>, public peoData class peoPop: public eoPop<EOT>, public peoData
{ {
@ -75,7 +79,9 @@ public:
}; };
/************************** DEFINE A CONTINUATOR ******************************************/ /**************************************************************************************/
/************************** DEFINE A CONTINUATOR ***********************************/
/**************************************************************************************/
class continuator class continuator
{ {
@ -84,6 +90,8 @@ public:
}; };
// Specific implementation : migration of a population
template < class EOT> class eoContinuator : public continuator{ template < class EOT> class eoContinuator : public continuator{
public: public:
@ -99,7 +107,9 @@ protected:
}; };
/************************** DEFINE A SELECTOR ******************************************/ /**************************************************************************************/
/************************** DEFINE A SELECTOR **************************************/
/**************************************************************************************/
template < class TYPE> class selector template < class TYPE> class selector
{ {
@ -108,6 +118,8 @@ public:
}; };
// Specific implementation : migration of a population
template < class EOT, class TYPE> class eoSelector : public selector< TYPE >{ template < class EOT, class TYPE> class eoSelector : public selector< TYPE >{
public: public:
@ -128,7 +140,9 @@ protected:
}; };
/************************** DEFINE A REPLACEMENT ******************************************/ /**************************************************************************************/
/************************** DEFINE A REPLACEMENT ***********************************/
/**************************************************************************************/
template < class TYPE> class replacement template < class TYPE> class replacement
{ {
@ -136,6 +150,9 @@ public:
virtual void operator()(TYPE &)=0; virtual void operator()(TYPE &)=0;
}; };
// Specific implementation : migration of a population
template < class EOT, class TYPE> class eoReplace : public replacement< TYPE >{ template < class EOT, class TYPE> class eoReplace : public replacement< TYPE >{
public: public:
eoReplace(eoReplacement<EOT> & _replace, TYPE & _destination): replace(_replace), destination(_destination){} eoReplace(eoReplacement<EOT> & _replace, TYPE & _destination): replace(_replace), destination(_destination){}
@ -150,4 +167,32 @@ protected:
TYPE & destination; TYPE & destination;
}; };
/**************************************************************************************/
/************************ Continuator for synchrone migartion ************************/
/**************************************************************************************/
class eoSyncContinue: public continuator
{
public:
eoSyncContinue (unsigned __period, unsigned __init_counter = 0): period (__period),counter (__init_counter) {}
virtual bool check()
{
return ((++ counter) % period) != 0 ;
}
private:
unsigned period;
unsigned counter;
};
#endif #endif

81
trunk/paradiseo-peo/src/peoSyncIslandMig.h
View file

@ -49,6 +49,7 @@
#include <eoSelect.h> #include <eoSelect.h>
#include <eoReplacement.h> #include <eoReplacement.h>
#include <eoPop.h> #include <eoPop.h>
#include "peoData.h"
#include "core/messaging.h" #include "core/messaging.h"
#include "core/eoPop_mesg.h" #include "core/eoPop_mesg.h"
@ -145,7 +146,7 @@
//! islands requires the reiteration of the steps 2 through 4 for creating distinct algorithms, with distinct populations and //! islands requires the reiteration of the steps 2 through 4 for creating distinct algorithms, with distinct populations and
//! the associated distinctly parametrized migration objects. The interconnecting element is the underlying topology, defined at step 1 //! the associated distinctly parametrized migration objects. The interconnecting element is the underlying topology, defined at step 1
//! (the same C++ migTopology object has to be passed as parameter for all the migration objects, in order to interconnect them). //! (the same C++ migTopology object has to be passed as parameter for all the migration objects, in order to interconnect them).
template< class EOT > class peoSyncIslandMig : public Cooperative, public eoUpdater template< class EOT, class TYPE > class peoSyncIslandMig : public Cooperative, public eoUpdater
{ {
public: public:
@ -161,11 +162,11 @@ public:
//! @param eoPop< EOT >& __destination - destination population in which the immigrant population are integrated. //! @param eoPop< EOT >& __destination - destination population in which the immigrant population are integrated.
peoSyncIslandMig( peoSyncIslandMig(
unsigned __frequency, unsigned __frequency,
eoSelect< EOT >& __select, selector <TYPE> & __select,
eoReplacement< EOT >& __replace, replacement <TYPE> & __replace,
Topology& __topology, Topology& __topology,
eoPop< EOT >& __source, peoData & __source,
eoPop< EOT >& __destination peoData & __destination
); );
//! Function operator to be called as checkpoint for performing the migration step. The emigrant individuals are selected //! Function operator to be called as checkpoint for performing the migration step. The emigrant individuals are selected
@ -202,20 +203,15 @@ private:
private: private:
eoPeriodicContinue< EOT > cont; eoSyncContinue cont; // continuator
eoSelect< EOT >& select; // selection strategy selector <TYPE> & select; // the selection strategy
eoReplacement< EOT >& replace; // replacement strategy replacement <TYPE> & replace; // the replacement strategy
Topology& topology; // neighboring topology Topology& topology; // the neighboring topology
peoData & source;
// source and target populations peoData & destination;
eoPop< EOT >& source; std :: queue< TYPE > imm;
eoPop< EOT >& destination; std :: queue< TYPE > em;
std :: queue< Cooperative* > coop_em;
// immigrants & emigrants in the queue
std :: queue< eoPop< EOT > > imm;
std :: queue< eoPop< EOT > > em;
std :: queue< Cooperative* > coop_em;
sem_t sync; sem_t sync;
@ -227,14 +223,14 @@ private:
}; };
template< class EOT > peoSyncIslandMig< EOT > :: peoSyncIslandMig( template< class EOT, class TYPE > peoSyncIslandMig< EOT,TYPE > :: peoSyncIslandMig(
unsigned __frequency, unsigned __frequency,
eoSelect< EOT >& __select, selector <TYPE> & __select,
eoReplacement< EOT >& __replace, replacement <TYPE> & __replace,
Topology& __topology, Topology& __topology,
eoPop< EOT >& __source, peoData & __source,
eoPop< EOT >& __destination peoData & __destination
) : cont( __frequency ), select( __select ), replace( __replace ), topology( __topology ), source( __source ), destination( __destination ) ) : cont( __frequency ), select( __select ), replace( __replace ), topology( __topology ), source( __source ), destination( __destination )
{ {
@ -244,35 +240,35 @@ template< class EOT > peoSyncIslandMig< EOT > :: peoSyncIslandMig(
} }
template< class EOT > void peoSyncIslandMig< EOT > :: pack() template< class EOT, class TYPE > void peoSyncIslandMig< EOT, TYPE > :: pack()
{ {
::pack( coop_em.front()->getKey() ); ::pack( coop_em.front()->getKey() );
::pack( em.front() ); em.front().pack();
coop_em.pop(); coop_em.pop();
em.pop(); em.pop();
} }
template< class EOT > void peoSyncIslandMig< EOT > :: unpack() template< class EOT, class TYPE > void peoSyncIslandMig< EOT, TYPE > :: unpack()
{ {
eoPop< EOT > mig; TYPE mig;
::unpack( mig ); mig.unpack();
imm.push( mig ); imm.push( mig );
explicitPassive = true; explicitPassive = true;
} }
template< class EOT > void peoSyncIslandMig< EOT > :: packSynchronizeReq() { template< class EOT, class TYPE > void peoSyncIslandMig< EOT,TYPE > :: packSynchronizeReq() {
packSynchronRequest( all ); packSynchronRequest( all );
} }
template< class EOT > void peoSyncIslandMig< EOT > :: emigrate() template< class EOT, class TYPE > void peoSyncIslandMig< EOT , TYPE > :: emigrate()
{ {
for ( unsigned i = 0; i < out.size(); i ++ ) for ( unsigned i = 0; i < out.size(); i ++ )
{ {
eoPop< EOT > mig; TYPE mig;
select( source, mig ); select( mig );
em.push( mig ); em.push( mig );
coop_em.push( out[ i ] ); coop_em.push( out[ i ] );
send( out[ i ] ); send( out[ i ] );
@ -280,46 +276,43 @@ template< class EOT > void peoSyncIslandMig< EOT > :: emigrate()
} }
} }
template< class EOT > void peoSyncIslandMig< EOT > :: immigrate() template< class EOT, class TYPE > void peoSyncIslandMig< EOT , TYPE > :: immigrate()
{ {
assert( imm.size() ); assert( imm.size() );
while ( imm.size() ) { while ( imm.size() ) {
replace( destination, imm.front() ) ; replace( imm.front() ) ;
imm.pop(); imm.pop();
} }
printDebugMessage( "peoSyncIslandMig: receiving some immigrants." ); printDebugMessage( "peoSyncIslandMig: receiving some immigrants." );
} }
template< class EOT > void peoSyncIslandMig< EOT > :: operator()() template< class EOT, class TYPE > void peoSyncIslandMig< EOT , TYPE > :: operator()()
{ {
if ( !cont( source ) ) if ( cont.check() )
{ {
explicitPassive = standbyMigration = false; explicitPassive = standbyMigration = false;
topology.setNeighbors( this, in, out ); all = topology; topology.setNeighbors( this, in, out ); all = topology;
nbMigrations = 0; nbMigrations = 0;
synchronizeCoopEx(); stop(); synchronizeCoopEx(); stop();
// sending emigrants // sending emigrants
emigrate(); emigrate();
// synchronizing // synchronizing
sem_wait( &sync ); sem_wait( &sync );
// receiving immigrants // receiving immigrants
immigrate(); immigrate();
synchronizeCoopEx(); stop(); synchronizeCoopEx(); stop();
} }
} }
template< class EOT > void peoSyncIslandMig< EOT > :: notifySending() template< class EOT, class TYPE > void peoSyncIslandMig< EOT , TYPE > :: notifySending()
{ {
if ( !explicitPassive ) getOwner()->setPassive(); if ( !explicitPassive ) getOwner()->setPassive();
} }
template< class EOT > void peoSyncIslandMig< EOT > :: notifyReceiving() template< class EOT, class TYPE > void peoSyncIslandMig< EOT , TYPE > :: notifyReceiving()
{ {
nbMigrations++; nbMigrations++;
@ -330,12 +323,12 @@ template< class EOT > void peoSyncIslandMig< EOT > :: notifyReceiving()
} }
} }
template< class EOT > void peoSyncIslandMig< EOT > :: notifySendingSyncReq () { template< class EOT, class TYPE > void peoSyncIslandMig< EOT, TYPE > :: notifySendingSyncReq () {
getOwner()->setPassive(); getOwner()->setPassive();
} }
template< class EOT > void peoSyncIslandMig< EOT > :: notifySynchronized () { template< class EOT, class TYPE > void peoSyncIslandMig< EOT, TYPE > :: notifySynchronized () {
standbyMigration = true; standbyMigration = true;
getOwner()->setActive(); getOwner()->setActive();

36
trunk/paradiseo-peo/tutorial/Wrapper/CMakeLists.txt
View file

@ -54,21 +54,21 @@ ENDIF(WIN32 AND NOT CYGWIN)
### 3) Define your target(s): just an executable here ### 3) Define your target(s): just an executable here
###################################################################################### ######################################################################################
#ADD_EXECUTABLE(example1 main1.cpp) ADD_EXECUTABLE(example1 main1.cpp)
#ADD_DEPENDENCIES(example1 peo rmc_mpi) ADD_DEPENDENCIES(example1 peo rmc_mpi)
#ADD_EXECUTABLE(example2 main2.cpp) ADD_EXECUTABLE(example2 main2.cpp)
#ADD_DEPENDENCIES(example2 peo rmc_mpi) ADD_DEPENDENCIES(example2 peo rmc_mpi)
#ADD_EXECUTABLE(example3 main3.cpp) ADD_EXECUTABLE(example3 main3.cpp)
#ADD_DEPENDENCIES(example3 peo rmc_mpi) ADD_DEPENDENCIES(example3 peo rmc_mpi)
ADD_EXECUTABLE(example4 main4.cpp) ADD_EXECUTABLE(example4 main4.cpp)
ADD_DEPENDENCIES(example4 peo rmc_mpi) ADD_DEPENDENCIES(example4 peo rmc_mpi)
#ADD_EXECUTABLE(example5 main5.cpp) ADD_EXECUTABLE(example5 main5.cpp)
#ADD_DEPENDENCIES(example5 tsp peo rmc_mpi) ADD_DEPENDENCIES(example5 tsp peo rmc_mpi)
#ADD_EXECUTABLE(example6 main6.cpp) ADD_EXECUTABLE(example6 main6.cpp)
#ADD_DEPENDENCIES(example6 tsp peo rmc_mpi) ADD_DEPENDENCIES(example6 tsp peo rmc_mpi)
#ADD_EXECUTABLE(example7 main7.cpp) ADD_EXECUTABLE(example7 main7.cpp)
#ADD_DEPENDENCIES(example7 peo rmc_mpi) ADD_DEPENDENCIES(example7 peo rmc_mpi)
###################################################################################### ######################################################################################
@ -85,12 +85,12 @@ ADD_DEPENDENCIES(example4 peo rmc_mpi)
### 5) Link the librairies ### 5) Link the librairies
###################################################################################### ######################################################################################
#TARGET_LINK_LIBRARIES(example1 ${XML2_LIBS} peo rmc_mpi eo eoutils) TARGET_LINK_LIBRARIES(example1 ${XML2_LIBS} peo rmc_mpi eo eoutils)
#TARGET_LINK_LIBRARIES(example2 ${XML2_LIBS} peo rmc_mpi eo eoutils) TARGET_LINK_LIBRARIES(example2 ${XML2_LIBS} peo rmc_mpi eo eoutils)
#TARGET_LINK_LIBRARIES(example3 ${XML2_LIBS} peo rmc_mpi eo eoutils) TARGET_LINK_LIBRARIES(example3 ${XML2_LIBS} peo rmc_mpi eo eoutils)
TARGET_LINK_LIBRARIES(example4 ${XML2_LIBS} peo rmc_mpi eo eoutils) TARGET_LINK_LIBRARIES(example4 ${XML2_LIBS} peo rmc_mpi eo eoutils)
#TARGET_LINK_LIBRARIES(example5 ${XML2_LIBS} tsp peo rmc_mpi eo eoutils) TARGET_LINK_LIBRARIES(example5 ${XML2_LIBS} tsp peo rmc_mpi eo eoutils)
#TARGET_LINK_LIBRARIES(example6 ${XML2_LIBS} tsp peo rmc_mpi eo eoutils) TARGET_LINK_LIBRARIES(example6 ${XML2_LIBS} tsp peo rmc_mpi eo eoutils)
#TARGET_LINK_LIBRARIES(example7 ${XML2_LIBS} tsp peo rmc_mpi eo eoutils) TARGET_LINK_LIBRARIES(example7 ${XML2_LIBS} tsp peo rmc_mpi eo eoutils)
###################################################################################### ######################################################################################

48
trunk/paradiseo-peo/tutorial/Wrapper/main2.cpp
View file

@ -24,34 +24,68 @@ int main( int __argc, char** __argv )
const float CROSS_RATE = 0.8; const float CROSS_RATE = 0.8;
const double EPSILON = 0.01; const double EPSILON = 0.01;
const float MUT_RATE = 0.5; const float MUT_RATE = 0.5;
const unsigned MIG_FREQ = 10;
const unsigned int MIG_SIZE = 5;
rng.reseed (time(0)); rng.reseed (time(0));
RingTopology topology;
// Algorithm // Algorithm
eoGenContinue < Indi > genContPara (MAX_GEN); eoGenContinue < Indi > genContPara (MAX_GEN);
eoCombinedContinue <Indi> continuatorPara (genContPara); eoCombinedContinue <Indi> continuatorPara (genContPara);
eoCheckPoint<Indi> checkpoint(continuatorPara); eoCheckPoint<Indi> checkpoint(continuatorPara);
peoEvalFunc<Indi> mainEval( f ); peoEvalFunc<Indi> mainEval( f );
peoPopEval <Indi> eval(mainEval); peoPopEval <Indi> eval(mainEval);
eoUniformGenerator < double >uGen (INIT_POSITION_MIN, INIT_POSITION_MAX); eoUniformGenerator < double >uGen (INIT_POSITION_MIN, INIT_POSITION_MAX);
eoInitFixedLength < Indi > random (VEC_SIZE, uGen); eoInitFixedLength < Indi > random (VEC_SIZE, uGen);
eoRankingSelect<Indi> selectionStrategy; eoRankingSelect<Indi> selectionStrategy;
eoSelectNumber<Indi> select(selectionStrategy,POP_SIZE); eoSelectNumber<Indi> select(selectionStrategy,POP_SIZE);
eoSegmentCrossover<Indi> crossover; eoSegmentCrossover<Indi> crossover;
eoUniformMutation<Indi> mutation(EPSILON); eoUniformMutation<Indi> mutation(EPSILON);
peoTransform<Indi> transform(crossover,CROSS_RATE,mutation,MUT_RATE); peoTransform<Indi> transform(crossover,CROSS_RATE,mutation,MUT_RATE);
peoPop < Indi > pop;
pop.append (POP_SIZE, random);
eoPlusReplacement<Indi> replace; eoPlusReplacement<Indi> replace;
eoRandomSelect<Indi> mig_select_one;
eoSelector <Indi, peoPop<Indi> > mig_select (mig_select_one,MIG_SIZE,pop);
eoReplace <Indi, peoPop<Indi> > mig_replace (replace,pop);
peoSyncIslandMig<Indi, peoPop<Indi> > mig(MIG_FREQ,mig_select,mig_replace,topology,pop,pop);
checkpoint.add(mig);
eoEasyEA< Indi > eaAlg( checkpoint, eval, select, transform, replace ); eoEasyEA< Indi > eaAlg( checkpoint, eval, select, transform, replace );
// Population*/ // Algorithm
eoPop < Indi > pop; eoGenContinue < Indi > genContPara2 (MAX_GEN);
pop.append (POP_SIZE, random); eoCombinedContinue <Indi> continuatorPara2 (genContPara2);
eoCheckPoint<Indi> checkpoint2(continuatorPara2);
peoEvalFunc<Indi> mainEval2( f );
peoPopEval <Indi> eval2(mainEval2);
eoUniformGenerator < double >uGen2 (INIT_POSITION_MIN, INIT_POSITION_MAX);
eoInitFixedLength < Indi > random2 (VEC_SIZE, uGen2);
eoRankingSelect<Indi> selectionStrategy2;
eoSelectNumber<Indi> select2(selectionStrategy2,POP_SIZE);
eoSegmentCrossover<Indi> crossover2;
eoUniformMutation<Indi> mutation2(EPSILON);
peoTransform<Indi> transform2(crossover2,CROSS_RATE,mutation2,MUT_RATE);
peoPop < Indi > pop2;
pop2.append (POP_SIZE, random2);
eoPlusReplacement<Indi> replace2;
eoRandomSelect<Indi> mig_select_one2;
eoSelector <Indi, peoPop<Indi> > mig_select2 (mig_select_one2,MIG_SIZE,pop2);
eoReplace <Indi, peoPop<Indi> > mig_replace2 (replace2,pop2);
peoSyncIslandMig<Indi, peoPop<Indi> > mig2(MIG_FREQ,mig_select2,mig_replace2,topology,pop2,pop2);
checkpoint2.add(mig2);
eoEasyEA< Indi > eaAlg2( checkpoint2, eval2, select2, transform2, replace2 );
peoWrapper parallelEA( eaAlg, pop); peoWrapper parallelEA( eaAlg, pop);
eval.setOwner(parallelEA); eval.setOwner(parallelEA);
transform.setOwner(parallelEA); transform.setOwner(parallelEA);
mig.setOwner(parallelEA);
peoWrapper parallelEA2( eaAlg2, pop2);
eval2.setOwner(parallelEA2);
transform2.setOwner(parallelEA2);
mig2.setOwner(parallelEA2);
peo :: run(); peo :: run();
peo :: finalize(); peo :: finalize();

9
trunk/paradiseo-peo/tutorial/Wrapper/main4.cpp
View file

@ -61,6 +61,8 @@ int main( int __argc, char** __argv )
peoPSOSelect<Indi> mig_selec(topology); peoPSOSelect<Indi> mig_selec(topology);
peoWorstPositionReplacement<Indi> mig_replac; peoWorstPositionReplacement<Indi> mig_replac;
// Specific implementation (peoData.h)
eoContinuator<Indi> cont(mig_cont, pop); eoContinuator<Indi> cont(mig_cont, pop);
eoSelector <Indi, peoPop<Indi> > mig_select (mig_selec,1,pop); eoSelector <Indi, peoPop<Indi> > mig_select (mig_selec,1,pop);
eoReplace <Indi, peoPop<Indi> > mig_replace (mig_replac,pop); eoReplace <Indi, peoPop<Indi> > mig_replace (mig_replac,pop);
@ -90,10 +92,13 @@ int main( int __argc, char** __argv )
// Island model // Island model
eoPeriodicContinue< Indi > mig_cont2( MIG_FREQ ); eoPeriodicContinue< Indi > mig_cont2( MIG_FREQ );
eoContinuator<Indi> cont2(mig_cont2,pop2);
peoPSOSelect<Indi> mig_selec2(topology2); peoPSOSelect<Indi> mig_selec2(topology2);
eoSelector <Indi, peoPop<Indi> > mig_select2 (mig_selec2,1,pop2);
peoWorstPositionReplacement<Indi> mig_replac2; peoWorstPositionReplacement<Indi> mig_replac2;
// Specific implementation (peoData.h)
eoContinuator<Indi> cont2(mig_cont2,pop2);
eoSelector <Indi, peoPop<Indi> > mig_select2 (mig_selec2,1,pop2);
eoReplace <Indi, peoPop<Indi> > mig_replace2 (mig_replac2,pop2); eoReplace <Indi, peoPop<Indi> > mig_replace2 (mig_replac2,pop2);