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

Rename peoParaPopEval to peoPopEval

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

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

@ -35,7 +35,7 @@ int main( int __argc, char** __argv )
eoCombinedContinue <Indi> continuatorPara (genContPara);
eoCheckPoint<Indi> checkpoint(continuatorPara);
peoEvalFunc<Indi> mainEval( f );
peoParaPopEval <Indi> eval(mainEval);
peoPopEval <Indi> eval(mainEval);
eoUniformGenerator < double >uGen (INIT_POSITION_MIN, INIT_POSITION_MAX);
eoInitFixedLength < Indi > random (VEC_SIZE, uGen);
eoRankingSelect<Indi> selectionStrategy;

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

@ -32,7 +32,7 @@ int main( int __argc, char** __argv )
eoCheckPoint<Indi> checkpoint(continuatorPara);
peoEvalFunc<Indi> mainEval( f );
peoParaPopEval <Indi> eval(mainEval);
peoPopEval <Indi> eval(mainEval);
eoUniformGenerator < double >uGen (INIT_POSITION_MIN, INIT_POSITION_MAX);
eoInitFixedLength < Indi > random (VEC_SIZE, uGen);

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

@ -32,7 +32,7 @@ int main( int __argc, char** __argv )
eoCheckPoint<Indi> checkpoint(continuatorPara);
peoEvalFunc<Indi, double, const Indi& > plainEval(f);
peoParaPopEval< Indi > eval(plainEval);
peoPopEval< Indi > eval(plainEval);
eoUniformGenerator < double >uGen (INIT_POSITION_MIN, INIT_POSITION_MAX);
eoInitFixedLength < Indi > random (VEC_SIZE, uGen);

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

@ -38,7 +38,7 @@ int main( int __argc, char** __argv )
eoCombinedContinue <Indi> continuatorPara (genContPara);
eoCheckPoint<Indi> checkpoint(continuatorPara);
peoEvalFunc<Indi, double, const Indi& > plainEval(f);
peoParaPopEval< Indi > eval(plainEval);
peoPopEval< Indi > eval(plainEval);
eoUniformGenerator < double >uGen (INIT_POSITION_MIN, INIT_POSITION_MAX);
eoInitFixedLength < Indi > random (VEC_SIZE, uGen);
eoUniformGenerator < double >sGen (INIT_VELOCITY_MIN, INIT_VELOCITY_MAX);
@ -67,7 +67,7 @@ int main( int __argc, char** __argv )
eoCombinedContinue <Indi> continuatorPara2 (genContPara2);
eoCheckPoint<Indi> checkpoint2(continuatorPara2);
peoEvalFunc<Indi, double, const Indi& > plainEval2(f);
peoParaPopEval< Indi > eval2(plainEval2);
peoPopEval< Indi > eval2(plainEval2);
eoUniformGenerator < double >uGen2 (INIT_POSITION_MIN, INIT_POSITION_MAX);
eoInitFixedLength < Indi > random2 (VEC_SIZE, uGen2);
eoUniformGenerator < double >sGen2 (INIT_VELOCITY_MIN, INIT_VELOCITY_MAX);

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

@ -52,7 +52,7 @@ int main( int __argc, char** __argv )
peo :: init (__argc, __argv);
peoEvalFunc<Indi, double, const Indi& > plainEval(f);
peoParaPopEval< Indi > eval(plainEval);
peoPopEval< Indi > eval(plainEval);
eoInitializer <Indi> init(eval,veloRandom,localInit,topology,pop);
eoSyncEasyPSO <Indi> psa(init,checkpoint,eval, velocity, flight);
peoWrapper parallelPSO( psa, pop);