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

peo modified

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@927 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
canape 2008-02-11 12:27:19 +00:00
commit 240685493b
15 changed files with 103 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

30
trunk/paradiseo-peo/tutorial/Lesson8/main.cpp
View file

@ -14,7 +14,7 @@ int main(int argc, char* argv[])
// Global archive
peoMoeoArchive<FlowShop> globalArch;
moeoArchive<FlowShop> globalArch;
if (getNodeRank()==1)
std::cout << "Archive before :\n" << globalArch << std::endl;
@ -31,7 +31,7 @@ int main(int argc, char* argv[])
peoMoeoPopEval<FlowShop>& eval = do_make_para_eval(parser, state);
eoInit<FlowShop>& init = do_make_genotype(parser, state);
eoGenOp<FlowShop>& op = do_make_op(parser, state);
peoMoeoPop<FlowShop>& pop = do_make_pop(parser, state, init); // peoMoeoPop is defined in parallelStruct.h
eoPop<FlowShop>& pop = do_make_pop(parser, state, init); // peoMoeoPop is defined in parallelStruct.h
moeoArchive<FlowShop> arch;
eoContinue<FlowShop>& term = do_make_continue_moeo(parser, state, eval);
eoCheckPoint < FlowShop> & checkpoint = state.storeFunctor(new eoCheckPoint < FlowShop > (term));
@ -40,24 +40,24 @@ int main(int argc, char* argv[])
// Selection mode in the EA
moeoRandomSelect <FlowShop> mig_select_one;
moeoSelector <FlowShop, peoMoeoPop<FlowShop> > mig_select (mig_select_one,MIG_SIZE,pop); // moeoSelector is defined in parallelStruct.h
moeoSelector <FlowShop, eoPop<FlowShop> > mig_select (mig_select_one,MIG_SIZE,pop); // moeoSelector is defined in parallelStruct.h
// Mode of replacement in the EA
moeoReplace < peoMoeoArchive<FlowShop>, peoMoeoPop<FlowShop> > mig_replace (pop); // moeoReplace is defined in parallelStruct.h
moeoReplace < moeoArchive<FlowShop>, eoPop<FlowShop> > mig_replace (pop); // moeoReplace is defined in parallelStruct.h
// Continuator for the island
eoPeriodicContinue< FlowShop> mig_cont( MIG_FREQ );
eoContinuator<FlowShop> cont(mig_cont, pop);
// Communication : EA ---> global archive
peoAsyncIslandMig< peoMoeoPop<FlowShop>, peoMoeoArchive<FlowShop> > mig(cont,mig_select, mig_replace, topology);
peoAsyncIslandMig< eoPop<FlowShop>, moeoArchive<FlowShop> > mig(cont,mig_select, mig_replace, topology);
checkpoint.add(mig);
// Selection mode in the global archive
moeoSelectorArchive < peoMoeoArchive<FlowShop> > mig_selectArchive (globalArch); // moeoSelectorArchive is defined in parallelStruct.h
moeoSelectorArchive < moeoArchive<FlowShop> > mig_selectArchive (globalArch); // moeoSelectorArchive is defined in parallelStruct.h
// Mode of replacement in the global archive
moeoReplaceArchive < peoMoeoPop<FlowShop>, peoMoeoArchive<FlowShop> > mig_replaceArchive (globalArch); // moeoReplaceArchive is defined in parallelStruct.h
moeoReplaceArchive < eoPop<FlowShop>, moeoArchive<FlowShop> > mig_replaceArchive (globalArch); // moeoReplaceArchive is defined in parallelStruct.h
// Continuator for the island
eoPeriodicContinue< FlowShop> mig_contArchive( MIG_FREQ );
eoContinuator<FlowShop> contArchive(mig_contArchive, pop);
// Communication : global archive ---> EA
peoAsyncIslandMig< peoMoeoArchive<FlowShop>, peoMoeoPop<FlowShop> > migArchive(contArchive, mig_selectArchive, mig_replaceArchive, topology);
peoAsyncIslandMig< moeoArchive<FlowShop>, eoPop<FlowShop> > migArchive(contArchive, mig_selectArchive, mig_replaceArchive, topology);
checkpoint.add(migArchive);
eoAlgo<FlowShop>& algo = do_make_ea_moeo(parser, state, eval, checkpoint, op, arch);
@ -79,22 +79,22 @@ int main(int argc, char* argv[])
peoMoeoPopEval<FlowShop>& eval2 = do_make_para_eval(parser2, state2);
eoInit<FlowShop>& init2 = do_make_genotype(parser2, state2);
eoGenOp<FlowShop>& op2 = do_make_op(parser2, state2);
peoMoeoPop<FlowShop>& pop2 = do_make_pop(parser2, state2, init2);
eoPop<FlowShop>& pop2 = do_make_pop(parser2, state2, init2);
moeoArchive<FlowShop> arch2;
eoContinue<FlowShop>& term2 = do_make_continue_moeo(parser2, state2, eval2);
eoCheckPoint < FlowShop> & checkpoint2 = state2.storeFunctor(new eoCheckPoint < FlowShop > (term2));
moeoRandomSelect <FlowShop> mig_select_one2;
moeoSelector <FlowShop, peoMoeoPop<FlowShop> > mig_select2 (mig_select_one2,MIG_SIZE,pop2);
moeoReplace < peoMoeoArchive<FlowShop>, peoMoeoPop<FlowShop> > mig_replace2 (pop2);
moeoSelector <FlowShop, eoPop<FlowShop> > mig_select2 (mig_select_one2,MIG_SIZE,pop2);
moeoReplace < moeoArchive<FlowShop>, eoPop<FlowShop> > mig_replace2 (pop2);
eoPeriodicContinue< FlowShop> mig_cont2( MIG_FREQ );
eoContinuator<FlowShop> cont2(mig_cont2, pop2);
peoAsyncIslandMig< peoMoeoPop<FlowShop>, peoMoeoArchive<FlowShop> > mig2(cont2,mig_select2, mig_replace2, topology2);
peoAsyncIslandMig< eoPop<FlowShop>, moeoArchive<FlowShop> > mig2(cont2,mig_select2, mig_replace2, topology2);
checkpoint2.add(mig2);
moeoSelectorArchive < peoMoeoArchive<FlowShop> > mig_selectArchive2 (globalArch);
moeoReplaceArchive < peoMoeoPop<FlowShop>, peoMoeoArchive<FlowShop> > mig_replaceArchive2 (globalArch);
moeoSelectorArchive < moeoArchive<FlowShop> > mig_selectArchive2 (globalArch);
moeoReplaceArchive < eoPop<FlowShop>, moeoArchive<FlowShop> > mig_replaceArchive2 (globalArch);
eoPeriodicContinue< FlowShop> mig_contArchive2( MIG_FREQ );
eoContinuator<FlowShop> contArchive2(mig_contArchive2, pop2);
peoAsyncIslandMig< peoMoeoArchive<FlowShop>, peoMoeoPop<FlowShop> > migArchive2(contArchive2, mig_selectArchive2, mig_replaceArchive2, topology2);
peoAsyncIslandMig< moeoArchive<FlowShop>, eoPop<FlowShop> > migArchive2(contArchive2, mig_selectArchive2, mig_replaceArchive2, topology2);
checkpoint2.add(migArchive2);
eoAlgo<FlowShop>& algo2 = do_make_ea_moeo(parser2, state2, eval2, checkpoint2, op2, arch2);
peoWrapper parallelMOEO2( algo2, pop2);

48
trunk/paradiseo-peo/tutorial/Lesson8/parallelStruct.h
View file

@ -1,51 +1,3 @@
template<class EOT>
class peoMoeoPop: public eoPop<EOT>, public peoData
{
public:
virtual void pack ()
{
::pack ((unsigned) this->size ());
for (unsigned i = 0; i < this->size (); i ++)
::pack ((*this)[i]);
}
virtual void unpack ()
{
unsigned n;
::unpack (n);
this->resize (n);
for (unsigned i = 0; i < n; i ++)
::unpack ((*this)[i]);
}
};
template<class MOEOT>
class peoMoeoArchive: public moeoArchive < MOEOT >, public peoData
{
public:
virtual void pack ()
{
::pack ((unsigned) this->size ());
for (unsigned i = 0; i < this->size (); i ++)
::pack ((*this)[i]);
}
virtual void unpack ()
{
unsigned n;
::unpack (n);
this->resize (n);
for (unsigned i = 0; i < n; i ++)
::unpack ((*this)[i]);
}
};
template < class EOT, class TYPE> class moeoSelector : public selector< TYPE >
{
public: