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

Delete peoPopEval

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@843 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
canape 2007-12-13 14:04:20 +00:00
commit 0e34aae83f
9 changed files with 7 additions and 296 deletions
Download patch file Download diff file Expand all files Collapse all files

36
trunk/paradiseo-peo/tutorial/Wrapper/main1.cpp
View file

@ -34,8 +34,8 @@ int main( int __argc, char** __argv )
eoGenContinue < Indi > genContPara (MAX_GEN);
eoCombinedContinue <Indi> continuatorPara (genContPara);
eoCheckPoint<Indi> checkpoint(continuatorPara);
eoEvalFuncPtr< Indi > mainEval( f );
eoEvalFuncCounter< Indi > eval(mainEval);
peoEvalFunc<Indi> mainEval( f );
peoParaPopEval <Indi> eval(mainEval);
eoUniformGenerator < double >uGen (INIT_POSITION_MIN, INIT_POSITION_MAX);
eoInitFixedLength < Indi > random (VEC_SIZE, uGen);
eoRankingSelect<Indi> selectionStrategy;
@ -43,7 +43,6 @@ int main( int __argc, char** __argv )
eoSegmentCrossover<Indi> crossover;
eoUniformMutation<Indi> mutation(EPSILON);
eoSGATransform<Indi> transform(crossover,CROSS_RATE,mutation,MUT_RATE);
peoSeqTransform<Indi> eaTransform(transform);
eoPlusReplacement<Indi> replace;
eoEasyEA< Indi > eaAlg( checkpoint, eval, select, transform, replace );
@ -57,35 +56,4 @@ int main( int __argc, char** __argv )
peo :: finalize();
if (getNodeRank()==1)
std::cout << "Final population :\n" << pop << std::endl;
// Algorithm
eoGenContinue < Indi > genContPara2 (MAX_GEN);
eoCombinedContinue <Indi> continuatorPara2 (genContPara2);
eoCheckPoint<Indi> checkpoint2(continuatorPara2);
eoEvalFuncPtr< Indi > mainEval2( f );
eoEvalFuncCounter< 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);
eoSGATransform<Indi> transform2(crossover2,CROSS_RATE,mutation2,MUT_RATE);
peoSeqTransform<Indi> eaTransform2(transform2);
eoPlusReplacement<Indi> replace2;
eoEasyEA< Indi > eaAlg2( checkpoint2, eval2, select2, transform2, replace2 );
// Population
eoPop < Indi > pop2;
pop2.append (POP_SIZE, random2);
// Wrapper
peo :: init( __argc, __argv );
peoWrapper parallelEA2( eaAlg2, pop2);
peo :: run();
peo :: finalize();
if (getNodeRank()==1)
std::cout << "Final population 2 :\n" << pop2 << std::endl;
}

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

@ -31,8 +31,6 @@ int main( int __argc, char** __argv )
eoCombinedContinue <Indi> continuatorPara (genContPara);
eoCheckPoint<Indi> checkpoint(continuatorPara);
//eoEvalFuncPtr< Indi > mainEval( f );
//eoEvalFuncCounter< Indi > eval(mainEval);
peoEvalFunc<Indi> mainEval( f );
peoParaPopEval <Indi> eval(mainEval);
@ -43,8 +41,6 @@ int main( int __argc, char** __argv )
eoSegmentCrossover<Indi> crossover;
eoUniformMutation<Indi> mutation(EPSILON);
//eoSGATransform<Indi> transform(crossover,CROSS_RATE,mutation,MUT_RATE);
//peoSeqTransform<Indi> eaTransform(transform);
peoParaSGATransform<Indi> transform(crossover,CROSS_RATE,mutation,MUT_RATE);
eoPlusReplacement<Indi> replace;

5
trunk/paradiseo-peo/tutorial/Wrapper/main5.cpp
View file

@ -42,13 +42,12 @@ int main (int __argc, char * * __argv)
eoPop <Route> pop (POP_SIZE, route_init);
eoGenContinue <Route> cont (NUM_GEN);
eoCheckPoint <Route> checkpoint (cont);
peoSeqPopEval <Route> eval (full_eval);
eoEvalFuncCounter< Route > eval(full_eval);
eoStochTournamentSelect <Route> select_one;
eoSelectNumber <Route> select (select_one, POP_SIZE);
eoSGATransform <Route> transform (order_cross, CROSS_RATE, city_swap_mut, MUT_RATE);
peoSeqTransform <Route> para_transform (transform);
eoEPReplacement <Route> replace (2);
eoEasyEA< Route > eaAlg( checkpoint, eval, select, para_transform, replace );
eoEasyEA< Route > eaAlg( checkpoint, eval, select, transform, replace );
peoWrapper parallelEA( eaAlg, pop);
peo :: run ();
peo :: finalize ();

5
trunk/paradiseo-peo/tutorial/Wrapper/main6.cpp
View file

@ -56,13 +56,12 @@ int main (int __argc, char * * __argv)
peo :: init (__argc, __argv);
eoGenContinue <Route> cont (NUM_GEN);
eoCheckPoint <Route> checkpoint (cont);
peoSeqPopEval <Route> eval (full_eval);
eoEvalFuncCounter< Route > eval(full_eval);
eoStochTournamentSelect <Route> select_one;
eoSelectNumber <Route> select (select_one, POP_SIZE);
eoSGATransform <Route> transform (order_cross, CROSS_RATE, city_swap_mut, MUT_RATE);
peoSeqTransform <Route> para_transform (transform);
eoEPReplacement <Route> replace (2);
eoEasyEA< Route > eaAlg( checkpoint, eval, select, para_transform, replace );
eoEasyEA< Route > eaAlg( checkpoint, eval, select, transform, replace );
peoWrapper parallelEA( eaAlg, pop);
peo :: run ();
peo :: finalize ();