tutorial PEO modified

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@903 331e1502-861f-0410-8da2-ba01fb791d7f

trunk/paradiseo-peo/tutorial/Lesson1/CMakeLists.txt

@@ -21,13 +21,6 @@ ADD_CUSTOM_COMMAND(
     ARGS -E copy_if_different
       ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson1/schema.xml
       ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson1)
-ADD_CUSTOM_COMMAND(
-    TARGET install
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND}
-    ARGS -E copy_if_different
-      ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson1/Lesson1.pdf
-      ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson1)
 
 ######################################################################################
 
@@ -36,7 +29,7 @@ ADD_CUSTOM_COMMAND(
 ### 1) Include the sources
 ######################################################################################
 
-INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MOEO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src)
 
 ######################################################################################
 

trunk/paradiseo-peo/tutorial/Lesson1/mainEA.cpp

@@ -77,20 +77,10 @@ int main (int __argc, char *__argv[])
   eoCombinedContinue <Indi> continuatorPara (genContPara);
   eoCheckPoint<Indi> checkpoint(continuatorPara);
 
-
-  /* In this lesson, you should define a peoEvalFunc witch will allow to initialize :
-   * 
-   *    - peoSeqPopEval : using to the sequential evaluation
-   * 
-   *   OR
-   * 
-   *    - peoParaPopEval : using to the parallel evaluation
-   * 
-   */
-
 // For a parallel evaluation
+  
   peoEvalFunc<Indi> plainEval(f);
-  peoParaPopEval< Indi > eval(plainEval);
+  peoPopEval <Indi> eval(plainEval);
 
 
 // Initialization
@@ -105,7 +95,6 @@ int main (int __argc, char *__argv[])
   eoSegmentCrossover<Indi> crossover; // Crossover
   eoUniformMutation<Indi>  mutation(EPSILON);  // Mutation
   eoSGATransform<Indi> transform(crossover,CROSS_RATE,mutation,MUT_RATE);
-  peoSeqTransform<Indi> eaTransform(transform);
   
 // Replacement
   eoPlusReplacement<Indi> replace;
@@ -114,12 +103,18 @@ int main (int __argc, char *__argv[])
   eoPop < Indi > pop;
   pop.append (POP_SIZE, random);
   
+// Algorithm
+  eoEasyEA< Indi > eaAlg( checkpoint, eval, select, transform, replace );
+
 //Parallel algorithm
-  peoEA<Indi> Algo(checkpoint,eval,select,eaTransform,replace);
+  peoWrapper parallelEA( eaAlg, pop);
-  Algo(pop);
+  eval.setOwner(parallelEA);
   
   peo :: run();
   peo :: finalize();
   if (getNodeRank()==1)
+  {
+  	pop.sort();
     std::cout << "Final population :\n" << pop << std::endl;
   }
+}

trunk/paradiseo-peo/tutorial/Lesson1/mainPSO.cpp

@@ -71,12 +71,11 @@ int main (int __argc, char *__argv[])
 
   const double INIT_POSITION_MIN = -2.0;  // For initialize x
   const double INIT_POSITION_MAX = 2.0;   // In the case of the Rosenbrock function : -2 < x[i] < 2
-
+  const double INIT_VELOCITY_MIN = -1.;  
-  const double INIT_VELOCITY_MIN = -1.;   // For initialize PSO's velocity
+  const double INIT_VELOCITY_MAX = 1.;    
-  const double INIT_VELOCITY_MAX = 1.;    // ie Lesson 6 of ParadisEO-EO
+  const double weight = 1;
-
+  const double C1 = 0.5; 
-  const double C1 = 0.5;   // For calculate the velocity
+  const double C2 = 2.;    
-  const double C2 = 2.;    // ie Lesson 6 of ParadisEO-EO
   rng.reseed (time(0));
 
 // Stopping
@@ -85,38 +84,22 @@ int main (int __argc, char *__argv[])
   eoCheckPoint<Indi> checkpoint(continuatorPara);
 
 
-
-
-  /* In this lesson, you should define a peoEvalFuncPSO witch will allow to initialize :
-   * 
-   *    - peoSeqPopEval : using to the sequential evaluation
-   * 
-   *   OR
-   * 
-   *    - peoParaPopEval : using to the parallel evaluation
-   * 
-   */
-
 // For a parallel evaluation
   peoEvalFunc<Indi, double, const Indi& > plainEval(f);
-  peoParaPopEval< Indi > eval(plainEval);
+  peoPopEval< Indi > eval(plainEval);
-
-
-
-
 
 // Initialization
   eoUniformGenerator < double >uGen (INIT_POSITION_MIN, INIT_POSITION_MAX);
   eoInitFixedLength < Indi > random (VEC_SIZE, uGen);
 
-// Velocity (ie Lesson 6 of ParadisEO-PEO)
+// Velocity 
   eoUniformGenerator < double >sGen (INIT_VELOCITY_MIN, INIT_VELOCITY_MAX);
   eoVelocityInitFixedLength < Indi > veloRandom (VEC_SIZE, sGen);
 
-// Initializing the best (ie Lesson 6 of ParadisEO-PEO)
+// Initializing the best 
   eoFirstIsBestInit < Indi > localInit;
 
-// Flight (ie Lesson 6 of ParadisEO-PEO)
+// Flight 
   eoRealVectorBounds bndsFlight(VEC_SIZE,INIT_POSITION_MIN,INIT_POSITION_MAX);
   eoStandardFlight < Indi > flight(bndsFlight);
 
@@ -124,19 +107,24 @@ int main (int __argc, char *__argv[])
   eoPop < Indi > pop;
   pop.append (POP_SIZE, random);
 
-// Initialization
-  peoInitializer <Indi> init(eval,veloRandom,localInit,pop);
-
 // Topology (ie Lesson 6 of ParadisEO-PEO)
   eoLinearTopology<Indi> topology(NEIGHBORHOOD_SIZE);
   eoRealVectorBounds bnds(VEC_SIZE,INIT_VELOCITY_MIN,INIT_VELOCITY_MAX);
-  eoStandardVelocity < Indi > velocity (topology,C1,C2,bnds);
+  eoStandardVelocity < Indi > velocity (topology,weight,C1,C2,bnds);
+  
+// Initialization
+  eoInitializer <Indi> init(eval,veloRandom,localInit,topology,pop);
   
 //Parallel algorithm
-  peoPSO < Indi > psa(init,checkpoint, eval, velocity, flight);
+  eoSyncEasyPSO <Indi> psa(init,checkpoint,eval, velocity, flight);
-  psa(pop);
+  peoWrapper parallelPSO( psa, pop);
+  eval.setOwner(parallelPSO);
+  
   peo :: run();
   peo :: finalize();
   if (getNodeRank()==1)
+  {
+  	pop.sort();
     std::cout << "Final population :\n" << pop << std::endl;
   }
+}

trunk/paradiseo-peo/tutorial/Lesson2/CMakeLists.txt

@@ -21,13 +21,6 @@ ADD_CUSTOM_COMMAND(
     ARGS -E copy_if_different
       ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson2/schema.xml
       ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson2)
-ADD_CUSTOM_COMMAND(
-    TARGET install
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND}
-    ARGS -E copy_if_different
-      ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson2/Lesson2.pdf
-      ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson2)
 
 ######################################################################################
 
@@ -36,7 +29,7 @@ ADD_CUSTOM_COMMAND(
 ### 1) Include the sources
 ######################################################################################
 
-INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MOEO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src)
 
 ######################################################################################
 

trunk/paradiseo-peo/tutorial/Lesson2/mainEA.cpp

@@ -65,7 +65,7 @@ int main (int __argc, char *__argv[])
   eoCombinedContinue <Indi> continuatorPara (genContPara);
   eoCheckPoint<Indi> checkpoint(continuatorPara);
   peoEvalFunc<Indi> plainEval(f);
-  peoSeqPopEval< Indi > eval(plainEval);  // Here, the evaluation is sequential
+  peoPopEval <Indi> eval(plainEval);
   eoUniformGenerator < double >uGen (INIT_POSITION_MIN, INIT_POSITION_MAX);
   eoInitFixedLength < Indi > random (VEC_SIZE, uGen);
   eoRankingSelect<Indi> selectionStrategy;
@@ -73,33 +73,22 @@ int main (int __argc, char *__argv[])
   eoSegmentCrossover<Indi> crossover; 
   eoUniformMutation<Indi>  mutation(EPSILON);
   
-  /******************************************************************************************/
+  peoTransform<Indi> transform(crossover,CROSS_RATE,mutation,MUT_RATE);
-
-  /* In this lesson, you can choose between  :
-   * 
-   *    - A sequential transformation (crossover + mutation) : eoSGATransform<Indi> transform(crossover,CROSS_RATE,mutation,MUT_RATE);
-   *                                                           peoSeqTransform<Indi> eaTransform(transform);
-   * 
-   *   OR
-   * 
-   *    - A parallel transformation (crossover + mutation) : peoParaSGATransform <Indi> eaTransform(crossover,CROSS_RATE,mutation,MUT_RATE); 
-   *
-   *  Unfortunately, if you don't use a crossover which creates two children with two parents,
-   *  you can't use this operator.
-   *  In this case, you should send a mail to : paradiseo-help@lists.gforge.inria.fr 
-   */
-
-  peoParaSGATransform <Indi> eaTransform(crossover,CROSS_RATE,mutation,MUT_RATE);
-
-  /******************************************************************************************/
 
   eoPlusReplacement<Indi> replace;
   eoPop < Indi > pop;
   pop.append (POP_SIZE, random);
-  peoEA<Indi> Algo(checkpoint,eval,select,eaTransform,replace);
+  eoEasyEA< Indi > eaAlg( checkpoint, eval, select, transform, replace );
-  Algo(pop);
+  peoWrapper parallelEA( eaAlg, pop);
+  eval.setOwner(parallelEA);
+  
+  transform.setOwner (parallelEA);
+  
   peo :: run();
   peo :: finalize();
   if (getNodeRank()==1)
+  {
+  	pop.sort();
     std::cout << "Final population :\n" << pop << std::endl;
   }
+}

trunk/paradiseo-peo/tutorial/Lesson3/CMakeLists.txt

@@ -21,13 +21,6 @@ ADD_CUSTOM_COMMAND(
     ARGS -E copy_if_different
       ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson3/schema.xml
       ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson3)
-ADD_CUSTOM_COMMAND(
-    TARGET install
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND}
-    ARGS -E copy_if_different
-      ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson3/Lesson3.pdf
-      ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson3)
 
 ######################################################################################
 
@@ -36,7 +29,7 @@ ADD_CUSTOM_COMMAND(
 ### 1) Include the sources
 ######################################################################################
 
-INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MOEO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src)
 
 ######################################################################################
 

trunk/paradiseo-peo/tutorial/Lesson3/mainEA.cpp

@@ -71,77 +71,72 @@ int main (int __argc, char *__argv[])
 
 // First algorithm
   /*****************************************************************************************/
+  
   eoGenContinue < Indi > genContPara (MAX_GEN);
   eoCombinedContinue <Indi> continuatorPara (genContPara);
   eoCheckPoint<Indi> checkpoint(continuatorPara);
-  peoEvalFunc<Indi> plainEval(f);
+  peoEvalFunc<Indi> mainEval( f );
-  peoSeqPopEval< Indi > eval(plainEval);  // Here, the evaluation is sequential
+  peoPopEval <Indi> eval(mainEval);
   eoUniformGenerator < double >uGen (INIT_POSITION_MIN, INIT_POSITION_MAX);
   eoInitFixedLength < Indi > random (VEC_SIZE, uGen);
   eoRankingSelect<Indi> selectionStrategy;
   eoSelectNumber<Indi> select(selectionStrategy,POP_SIZE);
   eoSegmentCrossover<Indi> crossover;
   eoUniformMutation<Indi>  mutation(EPSILON);  
-  eoSGATransform<Indi> transform(crossover,CROSS_RATE,mutation,MUT_RATE);
+  peoTransform<Indi> transform(crossover,CROSS_RATE,mutation,MUT_RATE); 
-  peoSeqTransform<Indi> eaTransform(transform); // Here, the transformation is sequential
+  peoPop < Indi > pop;
-  eoPlusReplacement<Indi> replace;
-  eoPop < Indi > pop;
   pop.append (POP_SIZE, random); 
-
+  eoPlusReplacement<Indi> replace;
-  eoPeriodicContinue <Indi> mig_cont( MIG_FREQ );  // Migration occurs periodically
+  eoRandomSelect<Indi> mig_select_one;
-  eoRandomSelect<Indi> mig_select_one; 		// Emigrants are randomly selected
+  eoSelector <Indi, peoPop<Indi> > mig_select (mig_select_one,MIG_SIZE,pop);
-  eoSelectNumber<Indi> mig_select (mig_select_one,MIG_SIZE);
+  eoReplace <Indi, peoPop<Indi> > mig_replace (replace,pop);
-  eoPlusReplacement<Indi> mig_replace; 		// Immigrants replace the worse individuals
+  peoSyncIslandMig<Indi, peoPop<Indi> > mig(MIG_FREQ,mig_select,mig_replace,topology,pop,pop);
+  checkpoint.add(mig);
+  eoEasyEA< Indi > eaAlg( checkpoint, eval, select, transform, replace );
+  peoWrapper parallelEA( eaAlg, pop);
+  eval.setOwner(parallelEA);
+  transform.setOwner(parallelEA);
+  mig.setOwner(parallelEA);
 
   /*****************************************************************************************/
 
 // Second algorithm (on the same model but with others names)
   /*****************************************************************************************/
+  
   eoGenContinue < Indi > genContPara2 (MAX_GEN);
   eoCombinedContinue <Indi> continuatorPara2 (genContPara2);
   eoCheckPoint<Indi> checkpoint2(continuatorPara2);
-  peoEvalFunc<Indi> plainEval2(f);
+  peoEvalFunc<Indi> mainEval2( f );
-  peoSeqPopEval< Indi > eval2(plainEval2);
+  peoPopEval <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);
+  peoTransform<Indi> transform2(crossover2,CROSS_RATE,mutation2,MUT_RATE); 
-  peoSeqTransform<Indi> eaTransform2(transform2);
+  peoPop < Indi > pop2;
-  eoPlusReplacement<Indi> replace2;
-  eoPop < Indi > pop2;
   pop2.append (POP_SIZE, random2); 
-  eoPeriodicContinue <Indi> mig_cont2( MIG_FREQ );
+  eoPlusReplacement<Indi> replace2;
   eoRandomSelect<Indi> mig_select_one2;
-  eoSelectNumber<Indi> mig_select2 (mig_select_one2,MIG_SIZE);
+  eoSelector <Indi, peoPop<Indi> > mig_select2 (mig_select_one2,MIG_SIZE,pop2);
-  eoPlusReplacement<Indi> mig_replace2;
+  eoReplace <Indi, peoPop<Indi> > mig_replace2 (replace2,pop2);
+  peoSyncIslandMig<Indi, peoPop<Indi> > mig2(MIG_FREQ,mig_select2,mig_replace2,topology,pop2,pop2);
+  checkpoint2.add(mig2);
+  eoEasyEA< Indi > eaAlg2( checkpoint2, eval2, select2, transform2, replace2 );
+  peoWrapper parallelEA2( eaAlg2, pop2);
+  eval2.setOwner(parallelEA2);
+  transform2.setOwner(parallelEA2);
+  mig2.setOwner(parallelEA2);
 
   /*****************************************************************************************/
 
-// You can choose between :
-//
-//      - Synchronous communication : peoSyncIslandMig<Indi> mig(MIG_FREQ,mig_select,mig_replace,topology,pop,pop);
-//      - Asynchronous communication : peoAsyncIslandMig<Indi> mig(mig_cont,mig_select,mig_replace,topology,pop,pop);
-// With a grid, you should use an asynchronous communication
-  peoAsyncIslandMig<Indi> mig(mig_cont,mig_select,mig_replace,topology,pop,pop2);
-  checkpoint.add(mig);
-  peoAsyncIslandMig<Indi> mig2(mig_cont2,mig_select2,mig_replace2,topology,pop2,pop);
-  checkpoint2.add(mig2);
-
-// Initialization of the algorithms
-  peoEA<Indi> Algo(checkpoint,eval,select,eaTransform,replace);
-  mig.setOwner(Algo);
-  Algo(pop);
-  peoEA<Indi> Algo2(checkpoint2,eval2,select2,eaTransform2,replace2);
-  mig2.setOwner(Algo2);
-  Algo2(pop2);
-
   peo :: run();
   peo :: finalize();
   if (getNodeRank()==1)
     {
+      pop.sort();
+      pop2.sort();
       std::cout << "Final population 1 :\n" << pop << std::endl;
       std::cout << "Final population 2 :\n" << pop2 << std::endl;
     }

trunk/paradiseo-peo/tutorial/Lesson3/mainPSO.cpp

@@ -49,37 +49,31 @@ double f (const Indi & _indi)
 
 int main (int __argc, char *__argv[])
 {
-
-// In this lesson, we define two algorithms of the PSO witch represents two islands.
-// Obviously, you can define more algorithms.
-
-// The parameters are common between the two algorithms.
-  /*****************************************************************************************/
   peo :: init( __argc, __argv );
   const unsigned int VEC_SIZE = 2;  
   const unsigned int POP_SIZE = 20; 
   const unsigned int NEIGHBORHOOD_SIZE= 6;
-  const unsigned int MAX_GEN = 150;
+  const unsigned int MAX_GEN = 100; 
   const double INIT_POSITION_MIN = -2.0;
   const double INIT_POSITION_MAX = 2.0; 
   const double INIT_VELOCITY_MIN = -1.;
   const double INIT_VELOCITY_MAX = 1.;
+  const unsigned int  MIG_FREQ = 10;
+  const double omega = 1;
   const double C1 = 0.5;
   const double C2 = 2.; 
-// C3 is used for the calculation of one of the strategies of the island model.
-  const double C3 = 2.;
-// MIG_FREQ define the frequency of the migration.
-  const unsigned int  MIG_FREQ = 10; // The optimal value is 1 or 2 for the component peoPSOVelocity.
   rng.reseed (time(0));
-  /*****************************************************************************************/
 
-// Define the topology of your island model
+// Island model
+
   RingTopology topologyMig;
   
-// First algorithm
+// First
-  /*****************************************************************************************/
+  eoGenContinue < Indi > genContPara (MAX_GEN);
+  eoCombinedContinue <Indi> continuatorPara (genContPara);
+  eoCheckPoint<Indi> checkpoint(continuatorPara);
   peoEvalFunc<Indi, double, const Indi& > plainEval(f);
-  peoSeqPopEval< Indi > eval(plainEval);   	// Here, the evaluation is sequential !
+  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);
@@ -87,27 +81,33 @@ int main (int __argc, char *__argv[])
   eoFirstIsBestInit < Indi > localInit;
   eoRealVectorBounds bndsFlight(VEC_SIZE,INIT_POSITION_MIN,INIT_POSITION_MAX);
   eoStandardFlight < Indi > flight(bndsFlight);
-  eoPop < Indi > pop;
+  peoPop < Indi > pop;
   pop.append (POP_SIZE, random);
-  peoInitializer <Indi> init(eval,veloRandom,localInit,pop);
   eoLinearTopology<Indi> topology(NEIGHBORHOOD_SIZE);
   eoRealVectorBounds bnds(VEC_SIZE,INIT_VELOCITY_MIN,INIT_VELOCITY_MAX);
-  eoStandardVelocity < Indi > velocity (topology,C1,C2,bnds);
+  eoStandardVelocity < Indi > velocity (topology,omega,C1,C2,bnds);
-  eoGenContinue < Indi > genContPara (MAX_GEN);
+  eoInitializer <Indi> init(eval,veloRandom,localInit,topology,pop);
-  eoCheckPoint<Indi> checkpoint(genContPara);
+
-// Specific implementation for the island model
+// Island model
+
   eoPeriodicContinue< Indi > mig_cont( MIG_FREQ );
   peoPSOSelect<Indi> mig_selec(topology);
-  eoSelectNumber< Indi > mig_select(mig_selec);
+  peoWorstPositionReplacement<Indi> mig_replac;
-// If you want to use a replacement stategy : peoPSOReplacement<Indi> mig_replace;
-// If you want to use a consideration of the migration in the calculation of the velocity : peoPSOVelocity<Indi> mig_replace(C3,velocity);
-  peoPSOReplacement<Indi> mig_replace;
-  /*****************************************************************************************/
   
-// Second algorithm (on the same model but with others names)
+ // Specific implementation (peoData.h)
-  /*****************************************************************************************/
+ 
+  eoContinuator<Indi> cont(mig_cont, pop);
+  eoSelector <Indi, peoPop<Indi> > mig_select (mig_selec,1,pop);
+  eoReplace <Indi, peoPop<Indi> > mig_replace (mig_replac,pop);
+
+
+// Second
+
+  eoGenContinue < Indi > genContPara2 (MAX_GEN);
+  eoCombinedContinue <Indi> continuatorPara2 (genContPara2);
+  eoCheckPoint<Indi> checkpoint2(continuatorPara2);
   peoEvalFunc<Indi, double, const Indi& > plainEval2(f);
-  peoSeqPopEval< 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);
@@ -115,38 +115,51 @@ int main (int __argc, char *__argv[])
   eoFirstIsBestInit < Indi > localInit2;
   eoRealVectorBounds bndsFlight2(VEC_SIZE,INIT_POSITION_MIN,INIT_POSITION_MAX);
   eoStandardFlight < Indi > flight2(bndsFlight2);
-  eoPop < Indi > pop2;
+  peoPop < Indi > pop2;
   pop2.append (POP_SIZE, random2);
-  peoInitializer <Indi> init2(eval2,veloRandom2,localInit2,pop2);
   eoLinearTopology<Indi> topology2(NEIGHBORHOOD_SIZE);
   eoRealVectorBounds bnds2(VEC_SIZE,INIT_VELOCITY_MIN,INIT_VELOCITY_MAX);
-  eoStandardVelocity < Indi > velocity2 (topology2,C1,C2,bnds2);
+  eoStandardVelocity < Indi > velocity2 (topology2,omega,C1,C2,bnds2);
-  eoGenContinue < Indi > genContPara2 (MAX_GEN);
+  eoInitializer <Indi> init2(eval2,veloRandom2,localInit2,topology2,pop2);
-  eoCheckPoint<Indi> checkpoint2(genContPara2);
+  
+// Island model
+
   eoPeriodicContinue< Indi > mig_cont2( MIG_FREQ );
   peoPSOSelect<Indi> mig_selec2(topology2);
-  eoSelectNumber< Indi > mig_select2(mig_selec2);
+  peoWorstPositionReplacement<Indi> mig_replac2;
-  peoPSOReplacement<Indi> mig_replace2;
-  /*****************************************************************************************/
 
-// Define the communication between the islands
+// Specific implementation (peoData.h)
-  peoAsyncIslandMig< Indi > mig( mig_cont, mig_select, mig_replace, topologyMig, pop, pop);
+
+  eoContinuator<Indi> cont2(mig_cont2,pop2);
+  eoSelector <Indi, peoPop<Indi> > mig_select2 (mig_selec2,1,pop2);
+  eoReplace <Indi, peoPop<Indi> > mig_replace2 (mig_replac2,pop2);
+  
+
+// Island model
+  
+  peoAsyncIslandMig< Indi, peoPop<Indi> > mig(cont,mig_select, mig_replace, topologyMig, pop, pop);
   checkpoint.add( mig );
-  peoAsyncIslandMig< Indi > mig2( mig_cont2, mig_select2, mig_replace2, topologyMig, pop2, pop2);
+  peoAsyncIslandMig< Indi, peoPop<Indi> > mig2(cont2,mig_select2, mig_replace2, topologyMig, pop2, pop2);
   checkpoint2.add( mig2 );
-// Initialization of the algorithms
-  peoPSO < Indi > psa(init,checkpoint, eval, velocity, flight);
-  mig.setOwner( psa );
-  psa(pop);
-  peoPSO < Indi > psa2(init2,checkpoint2, eval2, velocity2, flight2);
-  mig2.setOwner( psa2 );
-  psa2(pop2);
   
+
+// Parallel algorithm
+
+  eoSyncEasyPSO <Indi> psa(init,checkpoint,eval, velocity, flight);
+  peoWrapper parallelPSO( psa, pop);
+  eval.setOwner(parallelPSO);
+  mig.setOwner(parallelPSO);
+  eoSyncEasyPSO <Indi> psa2(init2,checkpoint2,eval2, velocity2, flight2);
+  peoWrapper parallelPSO2( psa2, pop2);
+  eval2.setOwner(parallelPSO2);
+  mig2.setOwner(parallelPSO2);
   peo :: run();
   peo :: finalize();
   if (getNodeRank()==1)
   {
-      std::cout << "Population 1 :\n" << pop << std::endl;
+  	pop.sort();
-      std::cout << "Population 2 :\n" << pop2 << std::endl;
+  	pop2.sort();
+    std::cout << "Final population :\n" << pop << std::endl;
+    std::cout << "Final population :\n" << pop2	 << std::endl;
   }
 }

trunk/paradiseo-peo/tutorial/Lesson4/CMakeLists.txt

@@ -21,13 +21,6 @@ ADD_CUSTOM_COMMAND(
     ARGS -E copy_if_different
       ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson4/schema.xml
       ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson4)
-ADD_CUSTOM_COMMAND(
-    TARGET install
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND}
-    ARGS -E copy_if_different
-      ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson4/Lesson4.pdf
-      ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson4)
 
 ######################################################################################
 
@@ -36,7 +29,7 @@ ADD_CUSTOM_COMMAND(
 ### 1) Include the sources
 ######################################################################################
 
-INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MOEO_SRC_DIR}/src  ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src ${TSP_SRC_DIR})
 
 ######################################################################################
 
@@ -46,13 +39,14 @@ INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_D
 ######################################################################################
 
 IF(NOT WIN32 OR CYGWIN)  
-  LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${ParadisEO-PEO_BINARY_DIR}/lib)
+  LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${MOEO_BIN_DIR}/lib ${ParadisEO-PEO_BINARY_DIR}/lib ${TSP_BINARY_DIR}/lib)
 ENDIF(NOT WIN32 OR CYGWIN)
 
 # especially for Visual Studio
 IF(WIN32 AND NOT CYGWIN)  
-  	LINK_DIRECTORIES(${EO_BIN_DIR}\\lib\\${CMAKE_BUILD_TYPE} ${ParadisEO-PEO_BINARY_DIR}\\lib\\${CMAKE_BUILD_TYPE})
+  	LINK_DIRECTORIES(${EO_BIN_DIR}\\lib\\${CMAKE_BUILD_TYPE} ${ParadisEO-PEO_BINARY_DIR}\\lib\\${CMAKE_BUILD_TYPE} ${TSP_BINARY_DIR}\\lib\\${CMAKE_BUILD_TYPE})
 ENDIF(WIN32 AND NOT CYGWIN)
+
 ######################################################################################
 
 
@@ -60,10 +54,11 @@ ENDIF(WIN32 AND NOT CYGWIN)
 ### 3) Define your target(s): just an executable here
 ######################################################################################
 
-ADD_EXECUTABLE(pso mainPSO.cpp)
+ADD_EXECUTABLE(lsea mainLSEA.cpp)
-ADD_DEPENDENCIES(pso peo rmc_mpi) 
+ADD_DEPENDENCIES(lsea tsp peo rmc_mpi)
-ADD_EXECUTABLE(ea mainEA.cpp)
+ADD_EXECUTABLE(eals mainEALS.cpp)
-ADD_DEPENDENCIES(ea peo rmc_mpi)
+ADD_DEPENDENCIES(eals tsp peo rmc_mpi)
+
 ######################################################################################
 
 
@@ -72,8 +67,9 @@ ADD_DEPENDENCIES(ea peo rmc_mpi)
 ######################################################################################
 
 SET(LESSON4_VERSION ${GLOBAL_VERSION})
-SET_TARGET_PROPERTIES(pso PROPERTIES VERSION "${LESSON4_VERSION}")
+SET_TARGET_PROPERTIES(lsea PROPERTIES VERSION "${LESSON4_VERSION}")
-SET_TARGET_PROPERTIES(ea PROPERTIES VERSION "${LESSON4_VERSION}")
+SET_TARGET_PROPERTIES(eals PROPERTIES VERSION "${LESSON4_VERSION}")
+
 ######################################################################################
 
 
@@ -81,8 +77,8 @@ SET_TARGET_PROPERTIES(ea PROPERTIES VERSION "${LESSON4_VERSION}")
 ### 5) Link the librairies
 ######################################################################################
 
-TARGET_LINK_LIBRARIES(pso ${XML2_LIBS} peo rmc_mpi eo eoutils) 
+TARGET_LINK_LIBRARIES(lsea ${XML2_LIBS} tsp peo rmc_mpi eo eoutils)
-TARGET_LINK_LIBRARIES(ea ${XML2_LIBS} peo rmc_mpi eo eoutils)
+TARGET_LINK_LIBRARIES(eals ${XML2_LIBS} tsp peo rmc_mpi eo eoutils)
 
 ######################################################################################
 

trunk/paradiseo-peo/tutorial/Lesson4/mainEA.cpp

@@ -1,152 +0,0 @@
-/*
-* <main.cpp>
-* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
-* (C) OPAC Team, INRIA, 2007
-*
-* Clive Canape
-*
-* This software is governed by the CeCILL license under French law and
-* abiding by the rules of distribution of free software.  You can  use,
-* modify and/ or redistribute the software under the terms of the CeCILL
-* license as circulated by CEA, CNRS and INRIA at the following URL
-* "http://www.cecill.info".
-*
-* As a counterpart to the access to the source code and  rights to copy,
-* modify and redistribute granted by the license, users are provided only
-* with a limited warranty  and the software's author,  the holder of the
-* economic rights,  and the successive licensors  have only  limited liability.
-*
-* In this respect, the user's attention is drawn to the risks associated
-* with loading,  using,  modifying and/or developing or reproducing the
-* software by the user in light of its specific status of free software,
-* that may mean  that it is complicated to manipulate,  and  that  also
-* therefore means  that it is reserved for developers  and  experienced
-* professionals having in-depth computer knowledge. Users are therefore
-* encouraged to load and test the software's suitability as regards their
-* requirements in conditions enabling the security of their systems and/or
-* data to be ensured and,  more generally, to use and operate it in the
-* same conditions as regards security.
-* The fact that you are presently reading this means that you have had
-* knowledge of the CeCILL license and that you accept its terms.
-*
-* ParadisEO WebSite : http://paradiseo.gforge.inria.fr
-* Contact: paradiseo-help@lists.gforge.inria.fr
-*
-*/
-
-#include <peo>
-#include <es.h>
-
-typedef eoReal<double> Indi;
-
-double f (const Indi & _indi)
-{
-  double sum;
-  sum=_indi[1]-pow(_indi[0],2);
-  sum=100*pow(sum,2);
-  sum+=pow((1-_indi[0]),2);
-  return (-sum);
-}
-
-int main (int __argc, char *__argv[])
-{
-
-// In this lesson, we can see an example of an evolutionary algorithms with three islands.
-// The evaluation is parallel.
-// The transformation is parallel.
-
-  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;
-  const unsigned int  MIG_FREQ = 10;
-  const unsigned int  MIG_SIZE = 5;
-  rng.reseed (time(0));
-  RingTopology topology;
-  eoGenContinue < Indi > genContPara (MAX_GEN);
-  eoCombinedContinue <Indi> continuatorPara (genContPara);
-  eoCheckPoint<Indi> checkpoint(continuatorPara);
-  peoEvalFunc<Indi> plainEval(f);
-  peoParaPopEval< Indi > eval(plainEval);
-  eoUniformGenerator < double >uGen (INIT_POSITION_MIN, INIT_POSITION_MAX);
-  eoInitFixedLength < Indi > random (VEC_SIZE, uGen);
-  eoRankingSelect<Indi> selectionStrategy;
-  eoSelectNumber<Indi> select(selectionStrategy,POP_SIZE);
-  eoSegmentCrossover<Indi> crossover;
-  eoUniformMutation<Indi>  mutation(EPSILON);
-  peoParaSGATransform <Indi> eaTransform(crossover,CROSS_RATE,mutation,MUT_RATE);
-  eoPlusReplacement<Indi> replace;
-  eoPop < Indi > pop;
-  pop.append (POP_SIZE, random);
-  eoPeriodicContinue <Indi> mig_cont( MIG_FREQ );
-  eoRandomSelect<Indi> mig_select_one;
-  eoSelectNumber<Indi> mig_select (mig_select_one,MIG_SIZE);
-  eoPlusReplacement<Indi> mig_replace;
-  eoGenContinue < Indi > genContPara2 (MAX_GEN);
-  eoCombinedContinue <Indi> continuatorPara2 (genContPara2);
-  eoCheckPoint<Indi> checkpoint2(continuatorPara2);
-  peoEvalFunc<Indi> plainEval2(f);
-  peoParaPopEval< Indi > eval2(plainEval2);
-  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);
-  peoParaSGATransform <Indi> eaTransform2(crossover2,CROSS_RATE,mutation2,MUT_RATE);
-  eoPlusReplacement<Indi> replace2;
-  eoPop < Indi > pop2;
-  pop2.append (POP_SIZE, random2);
-  eoPeriodicContinue <Indi> mig_cont2( MIG_FREQ );
-  eoRandomSelect<Indi> mig_select_one2;
-  eoSelectNumber<Indi> mig_select2 (mig_select_one2,MIG_SIZE);
-  eoPlusReplacement<Indi> mig_replace2;
-  eoGenContinue < Indi > genContPara3 (MAX_GEN);
-  eoCombinedContinue <Indi> continuatorPara3 (genContPara3);
-  eoCheckPoint<Indi> checkpoint3(continuatorPara3);
-  peoEvalFunc<Indi> plainEval3(f);
-  peoParaPopEval< Indi > eval3(plainEval3);
-  eoUniformGenerator < double >uGen3 (INIT_POSITION_MIN, INIT_POSITION_MAX);
-  eoInitFixedLength < Indi > random3 (VEC_SIZE, uGen3);
-  eoRankingSelect<Indi> selectionStrategy3;
-  eoSelectNumber<Indi> select3(selectionStrategy3,POP_SIZE);
-  eoSegmentCrossover<Indi> crossover3;
-  eoUniformMutation<Indi>  mutation3(EPSILON);
-  peoParaSGATransform <Indi> eaTransform3(crossover3,CROSS_RATE,mutation3,MUT_RATE);
-  eoPlusReplacement<Indi> replace3;
-  eoPop < Indi > pop3;
-  pop3.append (POP_SIZE, random3);
-  eoPeriodicContinue <Indi> mig_cont3( MIG_FREQ );
-  eoRandomSelect<Indi> mig_select_one3;
-  eoSelectNumber<Indi> mig_select3 (mig_select_one3,MIG_SIZE);
-  eoPlusReplacement<Indi> mig_replace3;
-  peoAsyncIslandMig<Indi> mig(mig_cont,mig_select,mig_replace,topology,pop,pop2);
-  checkpoint.add(mig);
-  peoAsyncIslandMig<Indi> mig2(mig_cont2,mig_select2,mig_replace2,topology,pop2,pop);
-  checkpoint2.add(mig2);
-  peoAsyncIslandMig<Indi> mig3(mig_cont3,mig_select3,mig_replace3,topology,pop3,pop);
-  checkpoint3.add(mig3);
-  peoEA<Indi> Algo(checkpoint,eval,select,eaTransform,replace);
-  mig.setOwner(Algo);
-  Algo(pop);
-  peoEA<Indi> Algo2(checkpoint2,eval2,select2,eaTransform2,replace2);
-  mig2.setOwner(Algo2);
-  Algo2(pop2);
-  peoEA<Indi> Algo3(checkpoint3,eval3,select3,eaTransform3,replace3);
-  mig3.setOwner(Algo3);
-  Algo3(pop3);
-
-  peo :: run();
-  peo :: finalize();
-  if (getNodeRank()==1)
-    {
-      std::cout << "Final population 1 :\n" << pop << std::endl;
-      std::cout << "Final population 2 :\n" << pop2 << std::endl;
-      std::cout << "Final population 3 :\n" << pop3 << std::endl;
-    }
-}

trunk/paradiseo-peo/tutorial/Lesson4/mainEALS.cpp

@@ -1,9 +1,9 @@
 /*
-* <example.cpp>
+* <main.cpp>
 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
-* (C) OPAC Team, LIFL, 2002-2007
+* (C) OPAC Team, INRIA, 2007
 *
-* Sebastien Cahon, Alexandru-Adrian Tantar, Clive Canape
+* Clive Canape
 *
 * This software is governed by the CeCILL license under French law and
 * abiding by the rules of distribution of free software.  You can  use,
@@ -33,11 +33,7 @@
 * Contact: paradiseo-help@lists.gforge.inria.fr
 *
 */
-// (c) OPAC Team, LIFL, 2007
-//
-// Contact: paradiseo-help@lists.gforge.inria.fr
 
-// Libraries of problem
 #include "param.h"
 #include "route_init.h"
 #include "route_eval.h"
@@ -54,7 +50,7 @@
 #include <peo>
 
 #define POP_SIZE 10
-#define NUM_GEN 10
+#define NUM_GEN 100
 #define CROSS_RATE 1.0
 #define MUT_RATE 0.01
 
@@ -62,57 +58,57 @@
 int main (int __argc, char * * __argv)
 {
 
-  // Example of a problem (TSP) with an hybridization
-
   peo :: init (__argc, __argv);
-
+  loadParameters (__argc, __argv); 
-
+  RouteInit route_init;
-  loadParameters (__argc, __argv); /* Processing some parameters relative to the tackled
+  RouteEval full_eval;
-  				      problem (TSP) */
+  OrderXover order_cross; 
-
-  RouteInit route_init; /* Its builds random routes */
-  RouteEval full_eval; /* Full route evaluator */
-
-
-  OrderXover order_cross; /* Recombination */
   PartialMappedXover pm_cross;
   EdgeXover edge_cross;
-  CitySwap city_swap_mut;  /* Mutation */
+  CitySwap city_swap_mut;  
 
-
+// Initialization of the local search
-  /** Local Search */
   TwoOptInit pmx_two_opt_init;
   TwoOptNext pmx_two_opt_next;
   TwoOptIncrEval pmx_two_opt_incr_eval;
   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);
 
-  /** The EA */
+// EA
-  eoPop <Route> ox_pop (POP_SIZE, route_init);  /* Population */
+  eoPop <Route> pop (POP_SIZE, route_init);
-
+  eoGenContinue <Route> cont (NUM_GEN); 
-  eoGenContinue <Route> ox_cont (NUM_GEN); /* A fixed number of iterations */
+  eoCheckPoint <Route> checkpoint (cont);
-  eoCheckPoint <Route> ox_checkpoint (ox_cont); /* Checkpoint */
+  eoEvalFuncCounter< Route > eval(full_eval);
-  peoSeqPopEval <Route> ox_pop_eval (full_eval);
+  eoStochTournamentSelect <Route> select_one;
-  eoStochTournamentSelect <Route> ox_select_one;
+  eoSelectNumber <Route> select (select_one, POP_SIZE);
-  eoSelectNumber <Route> ox_select (ox_select_one, POP_SIZE);
+  eoSGATransform <Route> transform (order_cross, CROSS_RATE, city_swap_mut, MUT_RATE);
-  eoSGATransform <Route> ox_transform (order_cross, CROSS_RATE, city_swap_mut, MUT_RATE);
+  eoEPReplacement <Route> replace (2);
-  peoSeqTransform <Route> ox_para_transform (ox_transform);
+  eoEasyEA< Route > eaAlg( checkpoint, eval, select, transform, replace );
-  eoEPReplacement <Route> ox_replace (2);
+  peoWrapper parallelEA( eaAlg, pop);
-
-  peoEA <Route> ox_ea (ox_checkpoint, ox_pop_eval, ox_select, ox_para_transform, ox_replace);
-
-  ox_ea (ox_pop);   /* Application to the given population */
-
-
   peo :: run ();
-  peo :: finalize (); /* Termination */
+  peo :: finalize (); 
 
   if (getNodeRank()==1)
-    std :: cout << "\nResult : "<<ox_pop[ 0 ].fitness();
+  {
-  hc( ox_pop[ 0 ] );
+  	pop.sort();
-  if (getNodeRank()==1)
+    std :: cout << "\nResult before the local search\n";
-    std :: cout << "\n\nAfter an hybridization : " << ox_pop[ 0 ].fitness() << std :: endl;
+    for(unsigned i=0;i<pop.size();i++)
-
+    	std::cout<<"\n"<<pop[i].fitness();
-
+  }
-  return 0;
+  
+// Local search
+  peo :: init (__argc, __argv);
+  peoMultiStart <Route> initParallelHC (hc);
+  peoWrapper parallelHC (initParallelHC, pop);
+  initParallelHC.setOwner(parallelHC);
+  peo :: run( );
+  peo :: finalize( );
+
+  if (getNodeRank()==1)
+  {
+    std :: cout << "\nResult after the local search\n";
+    pop.sort();
+    for(unsigned i=0;i<pop.size();i++)
+    	std::cout<<"\n"<<pop[i].fitness();
+  }
 }

trunk/paradiseo-peo/tutorial/Lesson4/mainLSEA.cpp

@@ -0,0 +1,113 @@
+/* <main.cpp>
+* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+* (C) OPAC Team, INRIA, 2007
+*
+* Clive Canape
+*
+* This software is governed by the CeCILL license under French law and
+* abiding by the rules of distribution of free software.  You can  use,
+* modify and/ or redistribute the software under the terms of the CeCILL
+* license as circulated by CEA, CNRS and INRIA at the following URL
+* "http://www.cecill.info".
+*
+* As a counterpart to the access to the source code and  rights to copy,
+* modify and redistribute granted by the license, users are provided only
+* with a limited warranty  and the software's author,  the holder of the
+* economic rights,  and the successive licensors  have only  limited liability.
+*
+* In this respect, the user's attention is drawn to the risks associated
+* with loading,  using,  modifying and/or developing or reproducing the
+* software by the user in light of its specific status of free software,
+* that may mean  that it is complicated to manipulate,  and  that  also
+* therefore means  that it is reserved for developers  and  experienced
+* professionals having in-depth computer knowledge. Users are therefore
+* encouraged to load and test the software's suitability as regards their
+* requirements in conditions enabling the security of their systems and/or
+* data to be ensured and,  more generally, to use and operate it in the
+* same conditions as regards security.
+* The fact that you are presently reading this means that you have had
+* knowledge of the CeCILL license and that you accept its terms.
+*
+* ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+* Contact: paradiseo-help@lists.gforge.inria.fr
+*
+*/
+
+#include "param.h"
+#include "route_init.h"
+#include "route_eval.h"
+#include "order_xover.h"
+#include "edge_xover.h"
+#include "partial_mapped_xover.h"
+#include "city_swap.h"
+#include "part_route_eval.h"
+#include "merge_route_eval.h"
+#include "two_opt_init.h"
+#include "two_opt_next.h"
+#include "two_opt_incr_eval.h"
+
+#include <peo>
+
+#define POP_SIZE 10
+#define NUM_GEN 200
+#define CROSS_RATE 1.0
+#define MUT_RATE 0.1
+
+
+int main (int __argc, char * * __argv)
+{
+
+  peo :: init (__argc, __argv);
+  loadParameters (__argc, __argv); 
+  RouteInit route_init;
+  RouteEval full_eval;
+  OrderXover order_cross; 
+  PartialMappedXover pm_cross;
+  EdgeXover edge_cross;
+  CitySwap city_swap_mut;  
+
+// Local search
+  TwoOptInit pmx_two_opt_init;
+  TwoOptNext pmx_two_opt_next;
+  TwoOptIncrEval pmx_two_opt_incr_eval;
+  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);
+  peoMultiStart <Route> initParallelHC (hc);
+  peoWrapper parallelHC (initParallelHC, pop);
+  initParallelHC.setOwner(parallelHC);
+  peo :: run( );
+  peo :: finalize( );
+
+  if (getNodeRank()==1)
+  {
+    std :: cout << "\nResult before the EA\n";
+    pop.sort();
+    for(unsigned i=0;i<pop.size();i++)
+    	std::cout<<"\n"<<pop[i].fitness();
+    std :: cout << "\n\n";
+  }
+
+// EA
+  peo :: init (__argc, __argv);
+  eoGenContinue <Route> cont (NUM_GEN); 
+  eoCheckPoint <Route> checkpoint (cont);
+  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);
+  eoEPReplacement <Route> replace (2);
+  eoEasyEA< Route > eaAlg( checkpoint, eval, select, transform, replace );
+  peoWrapper parallelEA( eaAlg, pop);
+  peo :: run ();
+  peo :: finalize (); 
+
+  if (getNodeRank()==1)
+  {
+    std :: cout << "\nResult after the EA\n";
+    pop.sort();
+    for(unsigned i=0;i<pop.size();i++)
+    	std::cout<<"\n"<<pop[i].fitness();
+    std :: cout << "\n\n";
+  }
+}

trunk/paradiseo-peo/tutorial/Lesson4/mainPSO.cpp

@@ -1,159 +0,0 @@
-/*
-* <main.cpp>
-* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
-* (C) OPAC Team, INRIA, 2007
-*
-* Clive Canape
-*
-* This software is governed by the CeCILL license under French law and
-* abiding by the rules of distribution of free software.  You can  use,
-* modify and/ or redistribute the software under the terms of the CeCILL
-* license as circulated by CEA, CNRS and INRIA at the following URL
-* "http://www.cecill.info".
-*
-* As a counterpart to the access to the source code and  rights to copy,
-* modify and redistribute granted by the license, users are provided only
-* with a limited warranty  and the software's author,  the holder of the
-* economic rights,  and the successive licensors  have only  limited liability.
-*
-* In this respect, the user's attention is drawn to the risks associated
-* with loading,  using,  modifying and/or developing or reproducing the
-* software by the user in light of its specific status of free software,
-* that may mean  that it is complicated to manipulate,  and  that  also
-* therefore means  that it is reserved for developers  and  experienced
-* professionals having in-depth computer knowledge. Users are therefore
-* encouraged to load and test the software's suitability as regards their
-* requirements in conditions enabling the security of their systems and/or
-* data to be ensured and,  more generally, to use and operate it in the
-* same conditions as regards security.
-* The fact that you are presently reading this means that you have had
-* knowledge of the CeCILL license and that you accept its terms.
-*
-* ParadisEO WebSite : http://paradiseo.gforge.inria.fr
-* Contact: paradiseo-help@lists.gforge.inria.fr
-*
-*/
-
-#include <peo>
-
-typedef eoRealParticle < double >Indi;
-
-double f (const Indi & _indi)
-{
-  double sum;
-  sum=_indi[1]-pow(_indi[0],2);
-  sum=100*pow(sum,2);
-  sum+=pow((1-_indi[0]),2);
-  return (-sum);
-}
-
-int main (int __argc, char *__argv[])
-{
-
-// In this lesson, we can see an example of a PSO with three islands.
-// The strategy of migration is the replacement.
-// The evaluation is parallel.
-
-  peo :: init( __argc, __argv );
-  const unsigned int VEC_SIZE = 2;
-  const unsigned int POP_SIZE = 20;
-  const unsigned int NEIGHBORHOOD_SIZE= 6;
-  const unsigned int MAX_GEN = 150;
-  const double INIT_POSITION_MIN = -2.0;
-  const double INIT_POSITION_MAX = 2.0;
-  const double INIT_VELOCITY_MIN = -1.;
-  const double INIT_VELOCITY_MAX = 1.;
-  const double C1 = 0.5;
-  const double C2 = 2.;
-  const double C3 = 2.;
-  const unsigned int  MIG_FREQ = 10;
-  rng.reseed (time(0));
-  RingTopology topologyMig;
-  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);
-  eoUniformGenerator < double >sGen (INIT_VELOCITY_MIN, INIT_VELOCITY_MAX);
-  eoVelocityInitFixedLength < Indi > veloRandom (VEC_SIZE, sGen);
-  eoFirstIsBestInit < Indi > localInit;
-  eoRealVectorBounds bndsFlight(VEC_SIZE,INIT_POSITION_MIN,INIT_POSITION_MAX);
-  eoStandardFlight < Indi > flight(bndsFlight);
-  eoPop < Indi > pop;
-  pop.append (POP_SIZE, random);
-  peoInitializer <Indi> init(eval,veloRandom,localInit,pop);
-  eoLinearTopology<Indi> topology(NEIGHBORHOOD_SIZE);
-  eoRealVectorBounds bnds(VEC_SIZE,INIT_VELOCITY_MIN,INIT_VELOCITY_MAX);
-  eoStandardVelocity < Indi > velocity (topology,C1,C2,bnds);
-  eoGenContinue < Indi > genContPara (MAX_GEN);
-  eoCheckPoint<Indi> checkpoint(genContPara);
-  eoPeriodicContinue< Indi > mig_cont( MIG_FREQ );
-  peoPSOSelect<Indi> mig_selec(topology);
-  eoSelectNumber< Indi > mig_select(mig_selec);
-  peoPSOReplacement<Indi> mig_replace;
-  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);
-  eoUniformGenerator < double >sGen2 (INIT_VELOCITY_MIN, INIT_VELOCITY_MAX);
-  eoVelocityInitFixedLength < Indi > veloRandom2 (VEC_SIZE, sGen2);
-  eoFirstIsBestInit < Indi > localInit2;
-  eoRealVectorBounds bndsFlight2(VEC_SIZE,INIT_POSITION_MIN,INIT_POSITION_MAX);
-  eoStandardFlight < Indi > flight2(bndsFlight2);
-  eoPop < Indi > pop2;
-  pop2.append (POP_SIZE, random2);
-  peoInitializer <Indi> init2(eval2,veloRandom2,localInit2,pop2);
-  eoLinearTopology<Indi> topology2(NEIGHBORHOOD_SIZE);
-  eoRealVectorBounds bnds2(VEC_SIZE,INIT_VELOCITY_MIN,INIT_VELOCITY_MAX);
-  eoStandardVelocity < Indi > velocity2 (topology2,C1,C2,bnds2);
-  eoGenContinue < Indi > genContPara2 (MAX_GEN);
-  eoCheckPoint<Indi> checkpoint2(genContPara2);
-  eoPeriodicContinue< Indi > mig_cont2( MIG_FREQ );
-  peoPSOSelect<Indi> mig_selec2(topology2);
-  eoSelectNumber< Indi > mig_select2(mig_selec2);
-  peoPSOReplacement<Indi> mig_replace2;
-  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);
-  eoUniformGenerator < double >sGen3 (INIT_VELOCITY_MIN, INIT_VELOCITY_MAX);
-  eoVelocityInitFixedLength < Indi > veloRandom3 (VEC_SIZE, sGen3);
-  eoFirstIsBestInit < Indi > localInit3;
-  eoRealVectorBounds bndsFlight3(VEC_SIZE,INIT_POSITION_MIN,INIT_POSITION_MAX);
-  eoStandardFlight < Indi > flight3(bndsFlight3);
-  eoPop < Indi > pop3;
-  pop3.append (POP_SIZE, random3);
-  peoInitializer <Indi> init3(eval3,veloRandom3,localInit3,pop3);
-  eoLinearTopology<Indi> topology3(NEIGHBORHOOD_SIZE);
-  eoRealVectorBounds bnds3(VEC_SIZE,INIT_VELOCITY_MIN,INIT_VELOCITY_MAX);
-  eoStandardVelocity < Indi > velocity3 (topology3,C1,C2,bnds3);
-  eoGenContinue < Indi > genContPara3 (MAX_GEN);
-  eoCheckPoint<Indi> checkpoint3(genContPara3);
-  eoPeriodicContinue< Indi > mig_cont3( MIG_FREQ );
-  peoPSOSelect<Indi> mig_selec3(topology3);
-  eoSelectNumber< Indi > mig_select3(mig_selec3);
-  peoPSOReplacement<Indi> mig_replace3;
-  peoAsyncIslandMig< Indi > mig( mig_cont, mig_select, mig_replace, topologyMig, pop, pop2);
-  checkpoint.add( mig );
-  peoAsyncIslandMig< Indi > mig2( mig_cont2, mig_select2, mig_replace2, topologyMig, pop2, pop3);
-  checkpoint2.add( mig2 );
-  peoAsyncIslandMig< Indi > mig3( mig_cont3, mig_select3, mig_replace3, topologyMig, pop3, pop);
-  checkpoint3.add( mig3 );
-  peoPSO < Indi > psa(init,checkpoint, eval, velocity, flight);
-  mig.setOwner( psa );
-  psa(pop);
-  peoPSO < Indi > psa2(init2,checkpoint2, eval2, velocity2, flight2);
-  mig2.setOwner( psa2 );
-  psa2(pop2);
-  peoPSO < Indi > psa3(init3,checkpoint3, eval3, velocity3, flight3);
-  mig3.setOwner( psa3 );
-  psa3(pop3);
-
-  peo :: run();
-  peo :: finalize();
-  if (getNodeRank()==1)
-    {
-      std::cout << "Population 1 :\n" << pop << std::endl;
-      std::cout << "Population 2 :\n" << pop2 << std::endl;
-      std::cout << "Population 3 :\n" << pop3 << std::endl;
-    }
-}

trunk/paradiseo-peo/tutorial/Lesson4/param

@@ -6,4 +6,6 @@
 
 --schema=schema.xml
 
+## parameters
 
+--inst=../examples/tsp/benchs/eil101.tsp

trunk/paradiseo-peo/tutorial/Lesson4/schema.xml

@@ -7,8 +7,6 @@
 		
 		<node name="1" num_workers="0">
 		<runner>1</runner>
-		<runner>2</runner>
-		<runner>3</runner>
 		</node>
 		
 		<node name="2" num_workers="1">

trunk/paradiseo-peo/tutorial/Lesson5/CMakeLists.txt

@@ -21,13 +21,6 @@ ADD_CUSTOM_COMMAND(
     ARGS -E copy_if_different
       ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson5/schema.xml
       ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson5)
-ADD_CUSTOM_COMMAND(
-    TARGET install
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND}
-    ARGS -E copy_if_different
-      ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson5/Lesson5.pdf
-      ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson5)
 
 ######################################################################################
 
@@ -36,7 +29,7 @@ ADD_CUSTOM_COMMAND(
 ### 1) Include the sources
 ######################################################################################
 
-INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src ${TSP_SRC_DIR})
+INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MOEO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src)
 
 ######################################################################################
 
@@ -46,12 +39,12 @@ INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_D
 ######################################################################################
 
 IF(NOT WIN32 OR CYGWIN)  
-  LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${ParadisEO-PEO_BINARY_DIR}/lib ${TSP_BINARY_DIR}/lib)
+  LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${ParadisEO-PEO_BINARY_DIR}/lib)
 ENDIF(NOT WIN32 OR CYGWIN)
 
 # especially for Visual Studio
 IF(WIN32 AND NOT CYGWIN)  
-  	LINK_DIRECTORIES(${EO_BIN_DIR}\\lib\\${CMAKE_BUILD_TYPE} ${ParadisEO-PEO_BINARY_DIR}\\lib\\${CMAKE_BUILD_TYPE} ${TSP_BINARY_DIR}\\lib\\${CMAKE_BUILD_TYPE})
+  	LINK_DIRECTORIES(${EO_BIN_DIR}\\lib\\${CMAKE_BUILD_TYPE} ${ParadisEO-PEO_BINARY_DIR}\\lib\\${CMAKE_BUILD_TYPE})
 ENDIF(WIN32 AND NOT CYGWIN) 
 
 ######################################################################################
@@ -62,8 +55,8 @@ ENDIF(WIN32 AND NOT CYGWIN)
 ######################################################################################
 
 # no matter what is the OS, hopefully
-ADD_EXECUTABLE(example example.cpp) 
+ADD_EXECUTABLE(pso main.cpp) 
-ADD_DEPENDENCIES(example tsp peo rmc_mpi)
+ADD_DEPENDENCIES(pso peo rmc_mpi)
 
 
 ######################################################################################
@@ -74,7 +67,7 @@ ADD_DEPENDENCIES(example tsp peo rmc_mpi)
 ######################################################################################
 
 SET(WALKTHROUGH_VERSION ${GLOBAL_VERSION})
-SET_TARGET_PROPERTIES(example PROPERTIES VERSION "${WALKTHROUGH_VERSION}")
+SET_TARGET_PROPERTIES(pso PROPERTIES VERSION "${WALKTHROUGH_VERSION}")
 
 ######################################################################################
 
@@ -83,7 +76,7 @@ SET_TARGET_PROPERTIES(example PROPERTIES VERSION "${WALKTHROUGH_VERSION}")
 ### 5) Link the librairies
 ######################################################################################
 
-TARGET_LINK_LIBRARIES(example ${XML2_LIBS} tsp peo rmc_mpi eo eoutils) 
+TARGET_LINK_LIBRARIES(pso ${XML2_LIBS} peo rmc_mpi eo eoutils) 
 
 ######################################################################################
 

trunk/paradiseo-peo/tutorial/Lesson5/main.cpp

@@ -0,0 +1,126 @@
+/*
+* <main.cpp>
+* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+* (C) OPAC Team, INRIA, 2007
+*
+* Clive Canape
+*
+* This software is governed by the CeCILL license under French law and
+* abiding by the rules of distribution of free software.  You can  use,
+* modify and/ or redistribute the software under the terms of the CeCILL
+* license as circulated by CEA, CNRS and INRIA at the following URL
+* "http://www.cecill.info".
+*
+* As a counterpart to the access to the source code and  rights to copy,
+* modify and redistribute granted by the license, users are provided only
+* with a limited warranty  and the software's author,  the holder of the
+* economic rights,  and the successive licensors  have only  limited liability.
+*
+* In this respect, the user's attention is drawn to the risks associated
+* with loading,  using,  modifying and/or developing or reproducing the
+* software by the user in light of its specific status of free software,
+* that may mean  that it is complicated to manipulate,  and  that  also
+* therefore means  that it is reserved for developers  and  experienced
+* professionals having in-depth computer knowledge. Users are therefore
+* encouraged to load and test the software's suitability as regards their
+* requirements in conditions enabling the security of their systems and/or
+* data to be ensured and,  more generally, to use and operate it in the
+* same conditions as regards security.
+* The fact that you are presently reading this means that you have had
+* knowledge of the CeCILL license and that you accept its terms.
+*
+* ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+* Contact: paradiseo-help@lists.gforge.inria.fr
+*
+*/
+
+#include <peo>
+#include <es.h>
+
+typedef eoRealParticle < double >Indi;
+
+double f (const Indi & _indi)
+{
+  double sum;
+  sum=_indi[1]-pow(_indi[0],2);
+  sum=100*pow(sum,2);
+  sum+=pow((1-_indi[0]),2);
+  return (-sum);
+}
+
+template <class EOT>
+class eoResizerInit: public eoInit<EOT>
+{
+    public:
+
+    typedef typename EOT::AtomType AtomType;
+
+        eoResizerInit(unsigned _size)
+            : size(_size){}
+
+        virtual void operator()(EOT& chrom)
+        {
+            chrom.resize(size);
+            chrom.invalidate();
+        }
+    private :
+        unsigned size;
+};
+
+
+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 NEIGHBORHOOD_SIZE= 6;
+  const unsigned int MAX_GEN = 300; 
+  const double INIT_POSITION_MIN = -2.0;
+  const double INIT_POSITION_MAX = 2.0; 
+  const double INIT_VELOCITY_MIN = -1.;
+  const double INIT_VELOCITY_MAX = 1.;
+  const double omega = 1;  
+  const double C1 = 0.5;
+  const double C2 = 2.; 
+  rng.reseed (time(0));
+  eoGenContinue < Indi > genContPara (MAX_GEN);
+  eoCombinedContinue <Indi> continuatorPara (genContPara);
+  eoCheckPoint<Indi> checkpoint(continuatorPara);
+  eoUniformGenerator < double >uGen (INIT_POSITION_MIN, INIT_POSITION_MAX);
+  eoUniformGenerator < double >sGen (INIT_VELOCITY_MIN, INIT_VELOCITY_MAX);
+  eoVelocityInitFixedLength < Indi > veloRandom (VEC_SIZE, sGen);
+  eoFirstIsBestInit < Indi > localInit;
+  eoRealVectorBounds bndsFlight(VEC_SIZE,INIT_POSITION_MIN,INIT_POSITION_MAX);
+  eoStandardFlight < Indi > flight(bndsFlight);
+  eoLinearTopology<Indi> topology(NEIGHBORHOOD_SIZE);
+  eoRealVectorBounds bnds(VEC_SIZE,INIT_VELOCITY_MIN,INIT_VELOCITY_MAX);
+  eoStandardVelocity < Indi > velocity (topology,omega,C1,C2,bnds);
+  
+  eoResizerInit<Indi> sizeInit(VEC_SIZE);
+  // need at least a size initialization
+  eoPop < Indi > pop(POP_SIZE,sizeInit);
+  eoInitFixedLength < Indi > randomSeq (VEC_SIZE, uGen);
+  peoMultiStart <Indi> initRandom (randomSeq);
+  peoWrapper random (initRandom,pop);
+  initRandom.setOwner(random);
+  peo :: run( );
+  peo :: finalize( );  
+
+// Parallel algorithm
+
+  peo :: init (__argc, __argv);
+  peoEvalFunc<Indi, double, const Indi& > plainEval(f);
+  peoPopEval< Indi > eval(plainEval);
+  eoInitializer <Indi> init(eval,veloRandom,localInit,topology,pop);
+  eoSyncEasyPSO <Indi> psa(init,checkpoint,eval, velocity, flight);
+  peoWrapper parallelPSO( psa, pop);
+  eval.setOwner(parallelPSO);
+  peo :: run();
+  peo :: finalize();
+  if (getNodeRank()==1)
+  {
+  	pop.sort();
+    std::cout << "Final population :\n" << pop << std::endl;
+  }
+}

trunk/paradiseo-peo/tutorial/Lesson5/param

@@ -5,9 +5,3 @@
 ## deployment schema
 
 --schema=schema.xml
-
-## parameters
-
---inst=../examples/tsp/benchs/eil101.tsp
-
-

trunk/paradiseo-peo/tutorial/Lesson6/CMakeLists.txt

@@ -4,9 +4,17 @@
 ######################################################################################
 
 SET (CMAKE_CXX_COMPILER mpicxx)
+SET(MAKE_SRC_DIR "${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson6/make" CACHE PATH "Make source directory" FORCE)
 
-ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson6/param ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson6/schema.xml)
+ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson6/param ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson6/FlowShopEA.param ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson6/schema.xml)
 
+ADD_CUSTOM_COMMAND(
+    TARGET install
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND}
+    ARGS -E copy_if_different
+      ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson6/FlowShopEA.param
+      ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson6)
 ADD_CUSTOM_COMMAND(
     TARGET install
     POST_BUILD
@@ -21,13 +29,7 @@ ADD_CUSTOM_COMMAND(
     ARGS -E copy_if_different
       ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson6/schema.xml
       ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson6)
-ADD_CUSTOM_COMMAND(
+
-    TARGET install
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND}
-    ARGS -E copy_if_different
-      ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson6/Lesson6.pdf
-      ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson6)
 ######################################################################################
 
 
@@ -35,7 +37,7 @@ ADD_CUSTOM_COMMAND(
 ### 1) Include the sources
 ######################################################################################
 
-INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src ${TSP_SRC_DIR})
+INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MOEO_SRC_DIR}/src ${FLOWSHOP_SRC_DIR} ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src ${TSP_SRC_DIR} ${MAKE_SRC_DIR})
 
 ######################################################################################
 
@@ -45,13 +47,10 @@ INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_D
 ######################################################################################
 
 IF(NOT WIN32 OR CYGWIN)  
-  LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${ParadisEO-PEO_BINARY_DIR}/lib ${TSP_BINARY_DIR}/lib)
+  LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${MOEO_BIN_DIR}/lib ${FLOWSHOP_BIN_DIR}/lib ${ParadisEO-PEO_BINARY_DIR}/lib ${TSP_BINARY_DIR}/lib)
 ENDIF(NOT WIN32 OR CYGWIN)
 
-# especially for Visual Studio
+ 
-IF(WIN32 AND NOT CYGWIN)  
-  	LINK_DIRECTORIES(${EO_BIN_DIR}\\lib\\${CMAKE_BUILD_TYPE} ${ParadisEO-PEO_BINARY_DIR}\\lib\\${CMAKE_BUILD_TYPE} ${TSP_BINARY_DIR}\\lib\\${CMAKE_BUILD_TYPE})
-ENDIF(WIN32 AND NOT CYGWIN) 
 
 ######################################################################################
 
@@ -61,7 +60,8 @@ ENDIF(WIN32 AND NOT CYGWIN)
 ######################################################################################
 
 ADD_EXECUTABLE(example main.cpp)
-ADD_DEPENDENCIES(example tsp peo rmc_mpi)
+ADD_DEPENDENCIES(example flowshop moeo peo rmc_mpi)
+
 
 ######################################################################################
 
@@ -70,22 +70,13 @@ ADD_DEPENDENCIES(example tsp peo rmc_mpi)
 ### 4) Optionnal: define your target(s)'s version: no effect for windows
 ######################################################################################
 
-SET(LESSON6_VERSION ${GLOBAL_VERSION})
-SET_TARGET_PROPERTIES(example PROPERTIES VERSION "${LESSON6_VERSION}")
 
 ######################################################################################
 
-
 ######################################################################################
 ### 5) Link the librairies
 ######################################################################################
 
-TARGET_LINK_LIBRARIES(example ${XML2_LIBS} tsp peo rmc_mpi eo eoutils)
+TARGET_LINK_LIBRARIES(example ${XML2_LIBS} flowshop moeo peo rmc_mpi eo eoutils)
-
 
 ######################################################################################
-
-
-
-
-

trunk/paradiseo-peo/tutorial/Lesson6/main.cpp

@@ -34,72 +34,34 @@
 *
 */
 
-
 #include <peo>
-
+#include <moeo>
-// Specific libraries (TSP)
+#include <make_library.h>
-#include <param.h>
+#include <FlowShop.h>
-#include <route.h>
-#include <route_eval.h>
-#include <route_init.h>
-#include <two_opt.h>
-#include <two_opt_init.h>
-#include <two_opt_next.h>
-#include <two_opt_incr_eval.h>
 
 
-int main( int __argc, char** __argv )
+
+int main(int argc, char* argv[])
 {
 
-  /* In this lesson you will learn to use a multi-start.
+	  peo :: init( argc,argv );
-   *
+      eoParser parser(argc, argv);  
-   * Thanks to this method, you can use several local searches together !!!
+      eoState state;                
-   *
+      peoMoeoPopEval<FlowShop>& eval = do_make_para_eval(parser, state);
-   */
+      eoInit<FlowShop>& init = do_make_genotype(parser, state);
-
+      eoGenOp<FlowShop>& op = do_make_op(parser, state);
-// Parameter
+      eoPop<FlowShop>& pop = do_make_pop(parser, state, init);
-  const unsigned int POP_SIZE = 10;
+      moeoArchive<FlowShop> arch;
-  srand( time(NULL) );
+      eoContinue<FlowShop>& term = do_make_continue_moeo(parser, state, eval);
-
+      eoCheckPoint<FlowShop>& checkpoint = do_make_checkpoint_moeo(parser, state, eval, term, pop, arch);
-// Initializing the ParadisEO-PEO environment
+      eoAlgo<FlowShop>& algo = do_make_ea_moeo(parser, state, eval, checkpoint, op, arch);
-  peo :: init( __argc, __argv );
+      peoWrapper parallelMOEO( algo, pop);
-// Processing the command line specified parameters
+      eval.setOwner(parallelMOEO);
-  loadParameters( __argc, __argv );
-
-// Define a Hill Climbing (you can choose an other local search)
-// ie Lessons of ParadisEO - MO
-  Route route;
-  RouteInit init;
-  init(route);
-  RouteEval eval;
-  eval(route);
-  TwoOptInit initHC;
-  TwoOptNext nextHC;
-  TwoOptIncrEval incrHC;
-  moBestImprSelect< TwoOpt > selectHC;
-  moHC< TwoOpt > hc(initHC, nextHC, incrHC, selectHC, eval);
-
-// Define a population
-  RouteInit initPop;	// Creates random Route objects
-  RouteEval evalPop;	// Offers a fitness value for a specified Route object
-  eoPop < Route > pop(POP_SIZE, initPop);
-  for ( unsigned int index = 0; index < POP_SIZE; index++ )
-    evalPop( pop[ index ] );
-
-// Setting up the parallel wrapper
-  peoSynchronousMultiStart< Route > parallelHC(hc);
-  peoParallelAlgorithmWrapper WrapHC (parallelHC, pop);
-  parallelHC.setOwner( WrapHC );
-
       peo :: run();
       peo :: finalize();
       if (getNodeRank()==1)
       {
-
+      	pop.sort();
-      std :: cout << "\n\nBefore : \n" << route;
+   	  	std::cout << "Final population :\n" << pop << std::endl;
-      std :: cout << "\n\nWith the synchronous Multi-Start HCs:";
-      for ( unsigned int index = 0; index < POP_SIZE; index++ )
-        std::cout <<"\n"<< pop[ index ];
       }
-
 }

trunk/paradiseo-peo/tutorial/Lesson6/make/make_library.h

@@ -0,0 +1,8 @@
+#include <make_eval_FlowShop.h>
+#include <make_genotype_FlowShop.h>
+#include <make_op_FlowShop.h>
+#include <do/make_pop.h>
+#include <make_continue_moeo.h>
+#include <make_checkpoint_moeo.h>
+#include <make_ea_moeo.h>
+#include <make_para_eval.h>

trunk/paradiseo-peo/tutorial/Lesson6/schema.xml

@@ -6,10 +6,6 @@
     </node>    
     <node name="1" num_workers="0">
       <runner>1</runner>
-      <runner>2</runner>
-      <runner>3</runner>
-      <runner>4</runner>
-      <runner>5</runner>
     </node>    
     <node name="2" num_workers="1">
     </node>    

trunk/paradiseo-peo/tutorial/Lesson7/CMakeLists.txt

@@ -1,81 +0,0 @@
-
-######################################################################################
-### 0) Set the compiler and define targets to easily run the lessons
-######################################################################################
-
-SET (CMAKE_CXX_COMPILER mpicxx)
-
-ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson7/param ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson7/FlowShopEA.param ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson7/schema.xml)
-
-ADD_CUSTOM_COMMAND(
-    TARGET install
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND}
-    ARGS -E copy_if_different
-      ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson7/FlowShopEA.param
-      ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson7)
-ADD_CUSTOM_COMMAND(
-    TARGET install
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND}
-    ARGS -E copy_if_different
-      ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson7/param
-      ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson7)
-ADD_CUSTOM_COMMAND(
-    TARGET install
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND}
-    ARGS -E copy_if_different
-      ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson7/schema.xml
-      ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson7)
-
-######################################################################################
-
-
-######################################################################################
-### 1) Include the sources
-######################################################################################
-
-INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MOEO_SRC_DIR}/src ${FLOWSHOP_SRC_DIR} ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src ${TSP_SRC_DIR})
-
-######################################################################################
-
-
-######################################################################################
-### 2) Specify where CMake can find the libraries (mandatory: before 3) )
-######################################################################################
-
-IF(NOT WIN32 OR CYGWIN)  
-  LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${MOEO_BIN_DIR}/lib ${FLOWSHOP_BIN_DIR}/lib ${ParadisEO-PEO_BINARY_DIR}/lib ${TSP_BINARY_DIR}/lib)
-ENDIF(NOT WIN32 OR CYGWIN)
-
- 
-
-######################################################################################
-
-
-######################################################################################
-### 3) Define your target(s): just an executable here
-######################################################################################
-
-ADD_EXECUTABLE(example main.cpp)
-ADD_DEPENDENCIES(example flowshop moeo peo rmc_mpi)
-
-
-######################################################################################
-
-
-######################################################################################
-### 4) Optionnal: define your target(s)'s version: no effect for windows
-######################################################################################
-
-
-######################################################################################
-
-######################################################################################
-### 5) Link the librairies
-######################################################################################
-
-TARGET_LINK_LIBRARIES(example ${XML2_LIBS} flowshop moeo peo rmc_mpi eo eoutils)
-
-######################################################################################

trunk/paradiseo-peo/tutorial/Lesson7/main.cpp

@@ -1,35 +0,0 @@
-#include <peo>
-#include <moeo>
-#include <make_eval_FlowShop.h>
-#include <make_genotype_FlowShop.h>
-#include <make_op_FlowShop.h>
-#include <do/make_pop.h>
-#include <../tutorial/Lesson7/make_continue_moeo.h>
-#include <../tutorial/Lesson7/make_checkpoint_moeo.h>
-#include <../tutorial/Lesson7/make_ea_moeo.h>
-#include <../tutorial/Lesson7/make_para_eval.h>
-#include <FlowShop.h>
-
-
-
-int main(int argc, char* argv[])
-{
-
-	  peo :: init( argc,argv );
-      eoParser parser(argc, argv);  
-      eoState state;                
-      peoMoeoPopEval<FlowShop>& eval = do_make_para_eval(parser, state);
-      eoInit<FlowShop>& init = do_make_genotype(parser, state);
-      eoGenOp<FlowShop>& op = do_make_op(parser, state);
-      eoPop<FlowShop>& pop = do_make_pop(parser, state, init);
-      moeoArchive<FlowShop> arch;
-      eoContinue<FlowShop>& term = do_make_continue_moeo(parser, state, eval);
-      eoCheckPoint<FlowShop>& checkpoint = do_make_checkpoint_moeo(parser, state, eval, term, pop, arch);
-      eoAlgo<FlowShop>& algo = do_make_ea_moeo(parser, state, eval, checkpoint, op, arch);
-      peoWrapper parallelMOEO( algo, pop);
-      eval.setOwner(parallelMOEO);
-      peo :: run();
-      peo :: finalize();
-      if (getNodeRank()==1)
-   	  	std::cout << "Final population :\n" << pop << std::endl;
-}

trunk/paradiseo-peo/tutorial/Lesson7/param

@@ -1,12 +0,0 @@
-## miscallenous parameters
-
---debug=false
-
-## deployment schema
-
---schema=schema.xml
-
-## parameters
-
---inst=../examples/tsp/benchs/eil101.tsp
-

trunk/paradiseo-peo/tutorial/Lesson7/schema.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-
-<schema>
-  <group scheduler="0">
-    <node name="0" num_workers="0">
-    </node>    
-    <node name="1" num_workers="0">
-      <runner>1</runner>
-    </node>    
-    <node name="2" num_workers="1">
-    </node>    
-    <node name="3" num_workers="1">
-    </node>    
-    </group>
-</schema>