diff --git a/eo/tutorial/Lesson3/SecondBitEA.cpp b/eo/tutorial/Lesson3/SecondBitEA.cpp index 8a208e0de..ebdae5e68 100644 --- a/eo/tutorial/Lesson3/SecondBitEA.cpp +++ b/eo/tutorial/Lesson3/SecondBitEA.cpp @@ -23,8 +23,6 @@ // define your genotype and fitness types typedef eoBin Indi; -// PARAMETRES - // the main_function: nothing changed(!), except variable initialization void main_function(int argc, char **argv) { @@ -187,8 +185,10 @@ void main_function(int argc, char **argv) // SELECT // The robust tournament selection eoDetTournament selectOne(tSize); // tSize in [2,POPSIZE] - // is now encapsulated in a eoSelectPerc (entage) - eoSelectPerc select(selectOne);// by default rate==1 + // is now encapsulated in a eoSelectPerc (stands for Percentage) + eoSelectPerc select(selectOne); + // or eoSelectPerc select(selectOne, rate); + // but by default rate==1 // REPLACE // And we now have the full slection/replacement - though with @@ -314,7 +314,7 @@ void main_function(int argc, char **argv) //////////////////////////////////////// // Easy EA requires - // selection, transformation, eval, replacement, and stopping criterion + // stopping criterion, eval, selection, transformation, replacement eoEasyEA gga(checkpoint, eval, select, transform, replace); // Apply algo to pop - that's it! diff --git a/eo/tutorial/html/SecondBitEA.html b/eo/tutorial/html/SecondBitEA.html index d64f450b3..d57e1a4ec 100644 --- a/eo/tutorial/html/SecondBitEA.html +++ b/eo/tutorial/html/SecondBitEA.html @@ -309,12 +309,14 @@ of initializatio of the population  // The robust tournament selection
 eoDetTournament<Indi> selectOne(tSize);        - // tSize in [2,POPSIZE]
 // is now encapsulated in a eoSelectPerc (entage) -
 eoSelectPerc<Indi> select(selectOne);// -by default rate==1 +
 eoSelectPerc<Indi> select(selectOne); +
 // or eoSelectPerc<Indi> select(selectOne, +rate);  +
 // but by default rate==1 +
  @@ -479,9 +481,8 @@ outState.registerObject(parser);
     outState.registerObject(rng);
     // and feed the state to state savers -
-// -save state every 100th  generation +
// save +state every 100th  generation
     eoCountedStateSaver stateSaver1(100, outState, "generation"); 
     // save state @@ -503,8 +504,8 @@ it for the (control and) output
 // the algorithm
 ////////////////////////////////////////
 // Easy EA requires  -
 // selection, transformation, -eval, replacement, and stopping criterion +
 // stopping criterion, eval, selection, +transformation, replacement
 eoEasyEA<Indi> gga(checkpoint, eval, select, transform, replace);
 // Apply algo to pop - that's