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

16
trunk/paradiseo-peo/tutorial/Lesson3/mainEA.cpp
View file

@ -84,13 +84,13 @@ int main (int __argc, char *__argv[])
eoSegmentCrossover<Indi> crossover;
eoUniformMutation<Indi> mutation(EPSILON);
peoTransform<Indi> transform(crossover,CROSS_RATE,mutation,MUT_RATE);
peoPop < Indi > pop;
eoPop < Indi > pop;
pop.append (POP_SIZE, random);
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<peoPop<Indi>, peoPop<Indi> > mig(MIG_FREQ,mig_select,mig_replace,topology);
eoSelector <Indi, eoPop<Indi> > mig_select (mig_select_one,MIG_SIZE,pop);
eoReplace <Indi, eoPop<Indi> > mig_replace (replace,pop);
peoSyncIslandMig<eoPop<Indi>, eoPop<Indi> > mig(MIG_FREQ,mig_select,mig_replace,topology);
checkpoint.add(mig);
eoEasyEA< Indi > eaAlg( checkpoint, eval, select, transform, replace );
peoWrapper parallelEA( eaAlg, pop);
@ -115,13 +115,13 @@ int main (int __argc, char *__argv[])
eoSegmentCrossover<Indi> crossover2;
eoUniformMutation<Indi> mutation2(EPSILON);
peoTransform<Indi> transform2(crossover2,CROSS_RATE,mutation2,MUT_RATE);
peoPop < Indi > pop2;
eoPop < 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<peoPop<Indi>, peoPop<Indi> > mig2(MIG_FREQ,mig_select2,mig_replace2,topology);
eoSelector <Indi, eoPop<Indi> > mig_select2 (mig_select_one2,MIG_SIZE,pop2);
eoReplace <Indi, eoPop<Indi> > mig_replace2 (replace2,pop2);
peoSyncIslandMig<eoPop<Indi>, eoPop<Indi> > mig2(MIG_FREQ,mig_select2,mig_replace2,topology);
checkpoint2.add(mig2);
eoEasyEA< Indi > eaAlg2( checkpoint2, eval2, select2, transform2, replace2 );
peoWrapper parallelEA2( eaAlg2, pop2);

16
trunk/paradiseo-peo/tutorial/Lesson3/mainPSO.cpp
View file

@ -81,7 +81,7 @@ int main (int __argc, char *__argv[])
eoFirstIsBestInit < Indi > localInit;
eoRealVectorBounds bndsFlight(VEC_SIZE,INIT_POSITION_MIN,INIT_POSITION_MAX);
eoStandardFlight < Indi > flight(bndsFlight);
peoPop < Indi > pop;
eoPop < Indi > pop;
pop.append (POP_SIZE, random);
eoLinearTopology<Indi> topology(NEIGHBORHOOD_SIZE);
eoRealVectorBounds bnds(VEC_SIZE,INIT_VELOCITY_MIN,INIT_VELOCITY_MAX);
@ -97,8 +97,8 @@ int main (int __argc, char *__argv[])
// Specific implementation (peoData.h)
eoContinuator<Indi> cont(mig_cont, pop);
eoSelector <Indi, peoPop<Indi> > mig_select (mig_selec,1,pop);
eoReplace <Indi, peoPop<Indi> > mig_replace (mig_replac,pop);
eoSelector <Indi, eoPop<Indi> > mig_select (mig_selec,1,pop);
eoReplace <Indi, eoPop<Indi> > mig_replace (mig_replac,pop);
// Second
@ -115,7 +115,7 @@ int main (int __argc, char *__argv[])
eoFirstIsBestInit < Indi > localInit2;
eoRealVectorBounds bndsFlight2(VEC_SIZE,INIT_POSITION_MIN,INIT_POSITION_MAX);
eoStandardFlight < Indi > flight2(bndsFlight2);
peoPop < Indi > pop2;
eoPop < Indi > pop2;
pop2.append (POP_SIZE, random2);
eoLinearTopology<Indi> topology2(NEIGHBORHOOD_SIZE);
eoRealVectorBounds bnds2(VEC_SIZE,INIT_VELOCITY_MIN,INIT_VELOCITY_MAX);
@ -131,15 +131,15 @@ int main (int __argc, char *__argv[])
// 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);
eoSelector <Indi, eoPop<Indi> > mig_select2 (mig_selec2,1,pop2);
eoReplace <Indi, eoPop<Indi> > mig_replace2 (mig_replac2,pop2);
// Island model
peoAsyncIslandMig< peoPop<Indi>, peoPop<Indi> > mig(cont,mig_select, mig_replace, topologyMig);
peoAsyncIslandMig< eoPop<Indi>, eoPop<Indi> > mig(cont,mig_select, mig_replace, topologyMig);
checkpoint.add( mig );
peoAsyncIslandMig< peoPop<Indi>, peoPop<Indi> > mig2(cont2,mig_select2, mig_replace2, topologyMig);
peoAsyncIslandMig< eoPop<Indi>, eoPop<Indi> > mig2(cont2,mig_select2, mig_replace2, topologyMig);
checkpoint2.add( mig2 );

2
trunk/paradiseo-peo/tutorial/Lesson6/make/make_library.h
View file

@ -1,7 +1,7 @@
#include <make_eval_FlowShop.h>
#include <make_genotype_FlowShop.h>
#include <make_op_FlowShop.h>
#include <make_peoMoeoPop.h>
#include <do/make_pop.h>
#include <make_continue_moeo.h>
#include <make_ea_moeo.h>
#include <make_para_eval.h>

59
trunk/paradiseo-peo/tutorial/Lesson6/make/make_peoMoeoPop.h
View file

@ -1,59 +0,0 @@
template <class EOT>
peoMoeoPop<EOT>& do_make_pop(eoParser & _parser, eoState& _state, eoInit<EOT> & _init)
{
// random seed
eoValueParam<uint32_t>& seedParam = _parser.createParam(uint32_t(0), "seed", "Random number seed", 'S');
if (seedParam.value() == 0)
seedParam.value() = time(0);
eoValueParam<unsigned>& popSize = _parser.createParam(unsigned(20), "popSize", "Population Size", 'P', "Evolution Engine");
// Either load or initialize
// create an empty pop and let the state handle the memory
peoMoeoPop<EOT>& pop = _state.takeOwnership(peoMoeoPop<EOT>());
eoValueParam<std::string>& loadNameParam = _parser.createParam(std::string(""), "Load","A save file to restart from",'L', "Persistence" );
eoValueParam<bool> & recomputeFitnessParam = _parser.createParam(false, "recomputeFitness", "Recompute the fitness after re-loading the pop.?", 'r', "Persistence" );
if (loadNameParam.value() != "") // something to load
{
// create another state for reading
eoState inState; // a state for loading - WITHOUT the parser
// register the rng and the pop in the state, so they can be loaded,
// and the present run will be the exact continuation of the saved run
// eventually with different parameters
inState.registerObject(pop);
inState.registerObject(rng);
inState.load(loadNameParam.value()); // load the pop and the rng
// the fitness is read in the file:
// do only evaluate the pop if the fitness has changed
if (recomputeFitnessParam.value())
{
for (unsigned i=0; i<pop.size(); i++)
pop[i].invalidate();
}
if (pop.size() < popSize.value())
std::cerr << "WARNING, only " << pop.size() << " individuals read in file " << loadNameParam.value() << "\nThe remaining " << popSize.value() - pop.size() << " will be randomly drawn" << std::endl;
if (pop.size() > popSize.value())
{
std::cerr << "WARNING, Load file contained too many individuals. Only the best will be retained" << std::endl;
pop.resize(popSize.value());
}
}
else // nothing loaded from a file
{
rng.reseed(seedParam.value());
}
if (pop.size() < popSize.value()) // missing some guys
{
// Init pop from the randomizer: need to use the append function
pop.append(popSize.value(), _init);
}
// for future stateSave, register the algorithm into the state
_state.registerObject(_parser);
_state.registerObject(pop);
_state.registerObject(rng);
return pop;
}

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

@ -39,7 +39,7 @@ int main (int __argc, char *__argv[])
eoPopLoopEval < Indi > evalArchive(firstEval);
eoUniformGenerator < double > uGenArchive (INIT_POSITION_MIN, INIT_POSITION_MAX);
eoInitFixedLength < Indi > randomArchive (VEC_SIZE, uGenArchive);
peoPop < Indi > empty_pop,archive;
eoPop < Indi > empty_pop,archive;
archive.append(POP_SIZE, randomArchive);
evalArchive (empty_pop,archive);
archive.sort();
@ -65,24 +65,24 @@ int main (int __argc, char *__argv[])
eoSegmentCrossover<Indi> crossover;
eoUniformMutation<Indi> mutation(EPSILON);
peoTransform<Indi> transform(crossover,CROSS_RATE,mutation,MUT_RATE);
peoPop < Indi > pop;
eoPop < Indi > pop;
pop.append (POP_SIZE, random);
eoPlusReplacement<Indi> replace;
eoBestSelect <Indi> mig_select_one;
eoSelector <Indi, peoPop<Indi> > mig_select (mig_select_one,MIG_SIZE,pop);
eoReplace <Indi, peoPop<Indi> > mig_replace (replace,pop);
eoSelector <Indi, eoPop<Indi> > mig_select (mig_select_one,MIG_SIZE,pop);
eoReplace <Indi, eoPop<Indi> > mig_replace (replace,pop);
eoPeriodicContinue< Indi > mig_cont( MIG_FREQ );
eoContinuator<Indi> cont(mig_cont, pop);
peoAsyncIslandMig< peoPop<Indi>, peoPop<Indi> > mig(cont,mig_select, mig_replace, topology);
peoAsyncIslandMig< eoPop<Indi>, eoPop<Indi> > mig(cont,mig_select, mig_replace, topology);
checkpoint.add(mig);
eoRandomSelect<Indi> mig_select_oneArchive;
eoSelector <Indi, peoPop<Indi> > mig_selectArchive (mig_select_oneArchive,MIG_SIZE,archive);
eoReplace <Indi, peoPop<Indi> > mig_replaceArchive (replace,archive);
eoSelector <Indi, eoPop<Indi> > mig_selectArchive (mig_select_oneArchive,MIG_SIZE,archive);
eoReplace <Indi, eoPop<Indi> > mig_replaceArchive (replace,archive);
eoPeriodicContinue< Indi > mig_contArchive( MIG_FREQ );
eoContinuator<Indi> contArchive(mig_contArchive, pop);
peoAsyncIslandMig< peoPop<Indi>, peoPop<Indi> > migArchive(contArchive,mig_selectArchive, mig_replaceArchive, topology);
peoAsyncIslandMig< eoPop<Indi>, eoPop<Indi> > migArchive(contArchive,mig_selectArchive, mig_replaceArchive, topology);
checkpoint.add(migArchive);
eoEasyEA< Indi > eaAlg( checkpoint, eval, select, transform, replace );
@ -107,24 +107,24 @@ int main (int __argc, char *__argv[])
eoSegmentCrossover<Indi> crossover2;
eoUniformMutation<Indi> mutation2(EPSILON);
peoTransform<Indi> transform2(crossover2,CROSS_RATE,mutation2,MUT_RATE);
peoPop < Indi > pop2;
eoPop < Indi > pop2;
pop2.append (POP_SIZE, random2);
eoPlusReplacement<Indi> replace2;
eoBestSelect <Indi> mig_select_one2;
eoSelector <Indi, peoPop<Indi> > mig_select2 (mig_select_one2,MIG_SIZE,pop2);
eoReplace <Indi, peoPop<Indi> > mig_replace2 (replace2,pop2);
eoSelector <Indi, eoPop<Indi> > mig_select2 (mig_select_one2,MIG_SIZE,pop2);
eoReplace <Indi, eoPop<Indi> > mig_replace2 (replace2,pop2);
eoPeriodicContinue< Indi > mig_cont2( MIG_FREQ );
eoContinuator<Indi> cont2(mig_cont2, pop2);
peoAsyncIslandMig< peoPop<Indi>, peoPop<Indi> > mig2(cont2,mig_select2, mig_replace2, topology);
peoAsyncIslandMig< eoPop<Indi>, eoPop<Indi> > mig2(cont2,mig_select2, mig_replace2, topology);
checkpoint2.add(mig2);
eoRandomSelect<Indi> mig_select_oneArchive2;
eoSelector <Indi, peoPop<Indi> > mig_selectArchive2 (mig_select_oneArchive2,MIG_SIZE,archive);
eoReplace <Indi, peoPop<Indi> > mig_replaceArchive2 (replace2,archive);
eoSelector <Indi, eoPop<Indi> > mig_selectArchive2 (mig_select_oneArchive2,MIG_SIZE,archive);
eoReplace <Indi, eoPop<Indi> > mig_replaceArchive2 (replace2,archive);
eoPeriodicContinue< Indi > mig_contArchive2( MIG_FREQ );
eoContinuator<Indi> contArchive2(mig_contArchive2, pop2);
peoAsyncIslandMig< peoPop<Indi>, peoPop<Indi> > migArchive2(contArchive2,mig_selectArchive2, mig_replaceArchive2, topology);
peoAsyncIslandMig< eoPop<Indi>, eoPop<Indi> > migArchive2(contArchive2,mig_selectArchive2, mig_replaceArchive2, topology);
checkpoint2.add(migArchive2);

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: