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

Rename in peo

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@841 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
canape 2007-12-10 08:37:23 +00:00
commit f128e5ec66
16 changed files with 54 additions and 683 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -52,7 +52,7 @@ int main( int __argc, char** __argv )
pop.append (POP_SIZE, random);
// Wrapper
peoParallelAlgorithmWrapper parallelEA( eaAlg, pop);
peoWrapper parallelEA( eaAlg, pop);
peo :: run();
peo :: finalize();
if (getNodeRank()==1)
@ -83,7 +83,7 @@ int main( int __argc, char** __argv )
// Wrapper
peo :: init( __argc, __argv );
peoParallelAlgorithmWrapper parallelEA2( eaAlg2, pop2);
peoWrapper parallelEA2( eaAlg2, pop2);
peo :: run();
peo :: finalize();
if (getNodeRank()==1)

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

@ -53,7 +53,7 @@ int main( int __argc, char** __argv )
// Population*/
eoPop < Indi > pop;
pop.append (POP_SIZE, random);
peoParallelAlgorithmWrapper parallelEA( eaAlg, pop);
peoWrapper parallelEA( eaAlg, pop);
eval.setOwner(parallelEA);
transform.setOwner(parallelEA);
peo :: run();

2
trunk/paradiseo-peo/tutorial/Wrapper/main3.cpp
View file

@ -51,7 +51,7 @@ int main( int __argc, char** __argv )
// Parallel algorithm
eoSyncEasyPSO <Indi> psa(init,checkpoint,eval, velocity, flight);
peoParallelAlgorithmWrapper parallelPSO( psa, pop);
peoWrapper parallelPSO( psa, pop);
eval.setOwner(parallelPSO);
peo :: run();
peo :: finalize();

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

@ -58,7 +58,7 @@ int main( int __argc, char** __argv )
eoPeriodicContinue< Indi > mig_cont( MIG_FREQ );
peoPSOSelect<Indi> mig_selec(topology);
eoSelectNumber< Indi > mig_select(mig_selec);
peoPSOReplacement<Indi> mig_replace;
peoWorstPositionReplacement<Indi> mig_replace;
// Second
@ -87,7 +87,7 @@ int main( int __argc, char** __argv )
eoPeriodicContinue< Indi > mig_cont2( MIG_FREQ );
peoPSOSelect<Indi> mig_selec2(topology2);
eoSelectNumber< Indi > mig_select2(mig_selec2);
peoPSOReplacement<Indi> mig_replace2;
peoWorstPositionReplacement<Indi> mig_replace2;
@ -102,11 +102,11 @@ int main( int __argc, char** __argv )
// Parallel algorithm
eoSyncEasyPSO <Indi> psa(init,checkpoint,eval, velocity, flight);
peoParallelAlgorithmWrapper parallelPSO( psa, pop);
peoWrapper parallelPSO( psa, pop);
eval.setOwner(parallelPSO);
mig.setOwner(parallelPSO);
eoSyncEasyPSO <Indi> psa2(init2,checkpoint2,eval2, velocity2, flight2);
peoParallelAlgorithmWrapper parallelPSO2( psa2, pop2);
peoWrapper parallelPSO2( psa2, pop2);
eval2.setOwner(parallelPSO2);
mig2.setOwner(parallelPSO2);
peo :: run();

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

@ -49,7 +49,7 @@ int main (int __argc, char * * __argv)
peoSeqTransform <Route> para_transform (transform);
eoEPReplacement <Route> replace (2);
eoEasyEA< Route > eaAlg( checkpoint, eval, select, para_transform, replace );
peoParallelAlgorithmWrapper parallelEA( eaAlg, pop);
peoWrapper parallelEA( eaAlg, pop);
peo :: run ();
peo :: finalize ();
@ -62,8 +62,8 @@ int main (int __argc, char * * __argv)
// Local search
peo :: init (__argc, __argv);
peoSynchronousMultiStart <Route> initParallelHC (hc);
peoParallelAlgorithmWrapper parallelHC (initParallelHC, pop);
peoMultiStart <Route> initParallelHC (hc);
peoWrapper parallelHC (initParallelHC, pop);
initParallelHC.setOwner(parallelHC);
peo :: run( );
peo :: finalize( );

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

@ -38,8 +38,8 @@ int main (int __argc, char * * __argv)
moBestImprSelect <TwoOpt> pmx_two_opt_move_select;
moHC <TwoOpt> hc (pmx_two_opt_init, pmx_two_opt_next, pmx_two_opt_incr_eval, pmx_two_opt_move_select, full_eval);
eoPop <Route> pop (POP_SIZE, route_init);
peoSynchronousMultiStart <Route> initParallelHC (hc);
peoParallelAlgorithmWrapper parallelHC (initParallelHC, pop);
peoMultiStart <Route> initParallelHC (hc);
peoWrapper parallelHC (initParallelHC, pop);
initParallelHC.setOwner(parallelHC);
peo :: run( );
peo :: finalize( );
@ -63,7 +63,7 @@ int main (int __argc, char * * __argv)
peoSeqTransform <Route> para_transform (transform);
eoEPReplacement <Route> replace (2);
eoEasyEA< Route > eaAlg( checkpoint, eval, select, para_transform, replace );
peoParallelAlgorithmWrapper parallelEA( eaAlg, pop);
peoWrapper parallelEA( eaAlg, pop);
peo :: run ();
peo :: finalize ();

6
trunk/paradiseo-peo/tutorial/Wrapper/main7.cpp
View file

@ -42,8 +42,8 @@ int main( int __argc, char** __argv )
eoPop < Indi > pop(POP_SIZE);
eoInitFixedLength < Indi > randomSeq (VEC_SIZE, uGen);
peoSynchronousMultiStart <Indi> initRandom (randomSeq);
peoParallelAlgorithmWrapper random (initRandom,pop);
peoMultiStart <Indi> initRandom (randomSeq);
peoWrapper random (initRandom,pop);
initRandom.setOwner(random);
peo :: run( );
peo :: finalize( );
@ -55,7 +55,7 @@ int main( int __argc, char** __argv )
peoParaPopEval< Indi > eval(plainEval);
eoInitializer <Indi> init(eval,veloRandom,localInit,topology,pop);
eoSyncEasyPSO <Indi> psa(init,checkpoint,eval, velocity, flight);
peoParallelAlgorithmWrapper parallelPSO( psa, pop);
peoWrapper parallelPSO( psa, pop);
eval.setOwner(parallelPSO);
peo :: run();
peo :: finalize();