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

peoEvalFuncPSO corrected

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@791 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
canape 2007-11-19 11:44:42 +00:00
commit 27e8f9db0d
6 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
trunk/paradiseo-peo/tutorial/Lesson1/Lesson1.pdf
View file

Binary file not shown.

2
trunk/paradiseo-peo/tutorial/Lesson1/mainPSO.cpp
View file

@ -98,7 +98,7 @@ int main (int __argc, char *__argv[])
*/
// For a parallel evaluation
peoEvalFuncPSO<Indi, double, const Indi& > plainEval(f);
peoEvalFunc<Indi, double, const Indi& > plainEval(f);
peoParaPopEval< Indi > eval(plainEval);

BIN
trunk/paradiseo-peo/tutorial/Lesson3/Lesson3.pdf
View file

Binary file not shown.

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

@ -78,7 +78,7 @@ int main (int __argc, char *__argv[])
// First algorithm
/*****************************************************************************************/
peoEvalFuncPSO<Indi, double, const Indi& > plainEval(f);
peoEvalFunc<Indi, double, const Indi& > plainEval(f);
peoSeqPopEval< Indi > eval(plainEval); // Here, the evaluation is sequential !
eoUniformGenerator < double >uGen (INIT_POSITION_MIN, INIT_POSITION_MAX);
eoInitFixedLength < Indi > random (VEC_SIZE, uGen);
@ -106,7 +106,7 @@ int main (int __argc, char *__argv[])
// Second algorithm (on the same model but with others names)
/*****************************************************************************************/
peoEvalFuncPSO<Indi, double, const Indi& > plainEval2(f);
peoEvalFunc<Indi, double, const Indi& > plainEval2(f);
peoSeqPopEval< Indi > eval2(plainEval2);
eoUniformGenerator < double >uGen2 (INIT_POSITION_MIN, INIT_POSITION_MAX);
eoInitFixedLength < Indi > random2 (VEC_SIZE, uGen2);

BIN
trunk/paradiseo-peo/tutorial/Lesson4/Lesson4.pdf
View file

Binary file not shown.

6
trunk/paradiseo-peo/tutorial/Lesson4/mainPSO.cpp
View file

@ -69,7 +69,7 @@ int main (int __argc, char *__argv[])
const unsigned int MIG_FREQ = 10;
rng.reseed (time(0));
RingTopology topologyMig;
peoEvalFuncPSO<Indi, double, const Indi& > plainEval(f);
peoEvalFunc<Indi, double, const Indi& > plainEval(f);
peoParaPopEval< Indi > eval(plainEval);
eoUniformGenerator < double >uGen (INIT_POSITION_MIN, INIT_POSITION_MAX);
eoInitFixedLength < Indi > random (VEC_SIZE, uGen);
@ -90,7 +90,7 @@ int main (int __argc, char *__argv[])
peoPSOSelect<Indi> mig_selec(topology);
eoSelectNumber< Indi > mig_select(mig_selec);
peoPSOReplacement<Indi> mig_replace;
peoEvalFuncPSO<Indi, double, const Indi& > plainEval2(f);
peoEvalFunc<Indi, double, const Indi& > plainEval2(f);
peoParaPopEval< Indi > eval2(plainEval2);
eoUniformGenerator < double >uGen2 (INIT_POSITION_MIN, INIT_POSITION_MAX);
eoInitFixedLength < Indi > random2 (VEC_SIZE, uGen2);
@ -111,7 +111,7 @@ int main (int __argc, char *__argv[])
peoPSOSelect<Indi> mig_selec2(topology2);
eoSelectNumber< Indi > mig_select2(mig_selec2);
peoPSOReplacement<Indi> mig_replace2;
peoEvalFuncPSO<Indi, double, const Indi& > plainEval3(f);
peoEvalFunc<Indi, double, const Indi& > plainEval3(f);
peoParaPopEval< Indi > eval3(plainEval3);
eoUniformGenerator < double >uGen3 (INIT_POSITION_MIN, INIT_POSITION_MAX);
eoInitFixedLength < Indi > random3 (VEC_SIZE, uGen3);