peo: lessons 1,2 and 3 modified

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@999 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
canape 2008-02-22 10:44:06 +00:00
commit 93f0cfd82e
8 changed files with 123 additions and 79 deletions

View file

@ -1,7 +1,7 @@
/*
* <main.cpp>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
* (C) OPAC Team, INRIA, 2007
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
* (C) OPAC Team, INRIA, 2008
*
* Clive Canape
*
@ -52,14 +52,15 @@ int main (int __argc, char *__argv[])
{
peo :: init( __argc, __argv );
const unsigned int VEC_SIZE = 2;
const unsigned int POP_SIZE = 20;
const unsigned int MAX_GEN = 300;
const double INIT_POSITION_MIN = -2.0;
const double INIT_POSITION_MAX = 2.0;
const float CROSS_RATE = 0.8;
const double EPSILON = 0.01;
const float MUT_RATE = 0.3;
eoParser parser(__argc, __argv);
unsigned int POP_SIZE = parser.createParam((unsigned int)(20), "popSize", "Population size",'P',"Param").value();
unsigned int MAX_GEN = parser.createParam((unsigned int)(100), "maxGen", "Maximum number of generations",'G',"Param").value();
double EPSILON = parser.createParam(0.01, "mutEpsilon", "epsilon for mutation",'e',"Param").value();
double CROSS_RATE = parser.createParam(0.25, "pCross", "Crossover probability",'C',"Param").value();
double MUT_RATE = parser.createParam(0.35, "pMut", "Mutation probability",'M',"Param").value();
unsigned int VEC_SIZE = parser.createParam((unsigned int)(2), "vecSize", "Vector size",'V',"Param").value();
double INIT_POSITION_MIN = parser.createParam(-2.0, "pMin", "Init position min",'N',"Param").value();
double INIT_POSITION_MAX = parser.createParam(2.0, "pMax", "Init position max",'X',"Param").value();
rng.reseed (time(0));
eoGenContinue < Indi > genContPara (MAX_GEN);
eoCombinedContinue <Indi> continuatorPara (genContPara);
@ -73,6 +74,7 @@ int main (int __argc, char *__argv[])
eoSegmentCrossover<Indi> crossover;
eoUniformMutation<Indi> mutation(EPSILON);
// Parallel transformation
peoTransform<Indi> transform(crossover,CROSS_RATE,mutation,MUT_RATE);
eoPlusReplacement<Indi> replace;
@ -82,6 +84,7 @@ int main (int __argc, char *__argv[])
peoWrapper parallelEA( eaAlg, pop);
eval.setOwner(parallelEA);
// setOwner
transform.setOwner (parallelEA);
peo :: run();

View file

@ -1,3 +1,13 @@
###### Param ######
--popSize=20 # -P : Population size
--maxGen=300 # -G : Maximum number of generations
--mutEpsilon=0.01 # -e : epsilon for mutation
--pCross=0.80 # -C : Crossover probability
--pMut=0.30 # -M : Mutation probability
--vecSize=2 # -V : Vector size
--pMin=-2.0 # -N : Init position min
--pMax=2.0 # -X : Init position max
## miscallenous parameters
--debug=false