diff --git a/eo/tutorial/html/eoEngine.html b/eo/tutorial/html/eoEngine.html
index 42e8b430..ecd9d5ec 100644
--- a/eo/tutorial/html/eoEngine.html
+++ b/eo/tutorial/html/eoEngine.html
@@ -2,7 +2,7 @@
-
+
Genetic Engine
@@ -94,44 +94,29 @@ two objects of respective types eoReduce
and you can probably guess what each of them actually does :-)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Available instances of eoMergeReduce replacement
-include
+
Available instances of eoMergeReduce
+replacement include
-
eoCommaReplacement, one of
-the two standard strategies in Evolution Strategies,
-selects the best offspring. It is an eoMergeReduce(eoNoElitism,
-eoTruncate).
+the two standard strategies in Evolution Strategies,
+selects the best offspring. It is an
+eoMergeReduce(eoNoElitism, eoTruncate).
-
eoPlusReplacement, the other
-standard Evolution Startegies replacement,
-where the best from offspring+parents become the next generation. It is
-an eoMergeReduce(eoPlus, eoTruncate).
+standard Evolution Startegies replacement,
+where the best from offspring+parents
+become the next generation. It is an eoMergeReduce(eoPlus,
+eoTruncate).
-
-eoEPReplacement, used in the
-Evolutionary
-Programming historical algorithm, doing a stochastic tournament
+eoEPReplacement, used in the
+Evolutionary
+Programming historical algorithm, does an EP stochastic tournament
among parents + offspring. It is an eoMergeReduce(eoPlus,
-eoEPReduce) and its constructor requires as argument the
-size of the tournament (unsigned int).
+eoEPReduce) and its constructor requires as argument T,
+the size of the tournament (unsigned int).
@@ -189,7 +174,7 @@ an elitist replacement makes no sense - but will not harm either :-)
file
The file t-eoReplacement
in the test directory implements all
-above replacmenet procedures withni a very simple and easy-to-monitor Dummy
+above replacmenet procedures within a very simple and easy-to-monitor Dummy
EO class.
@@ -237,34 +222,41 @@ selection can be used to select a single individual, both uses are probably
a waste of CPU time.
-
-Deterministic Tournament of
-size T selects returns the best of T uniformly chosen individuals in the
-population. It is implemented in the eoDetTournamentSelect
+Deterministic
+Tournament of size T returns the best of T uniformly chosen
+individuals in the population. Its size T should be an integer >= 2. It
+is implemented in the eoDetTournamentSelect
class, a sub-class of eoSelectOne, as well as in the eoDetTournamentTruncate
class that repeatidly removes from the population the "winner" of the inverse
tournament. These objects use the C++ function determinitic_tournament
in selectors.h.
-
-Stochastic Tournament of rate
-R first choses two individuals from the population, and selects the best
-one with probability R and the worse one with probability (1-R). It is
-implemented in the eoStochTournamentSelect
+Stochastic Tournament
+of rate R first choses two individuals from the population, and selects
+the best one with probability R (the worse one with probability 1-R). Real
+parameter R should be in [0.5,1]. It is implemented in the eoStochTournamentSelect
class, a sub-class of eoSelectOne, as well as in the eoStochTournamentTruncate
class that repeatidly removes from the population the "winner" of the inverse
tournament. These objects use the C++ function determinitic_tournament
-in selectors.h.
+in selectors.h.
+Note: A stochastic tournament with
+rate 1.0 is strictly identical to a deterministic tournament of size 2.
-EP Tournament of size T is
-a global tournament: it works by assigning a score to all individuals in
-the population the following way: starting with a score of 0, each individual
-I is "opposed" T times to a uniformly chosen individual. Everytime I wins,
-its score in incremented by 1 (and by 0.5 for every draw). The individuals
-are then selected deterministically based on their scores from that procedure.
-The EP Tournament is implemented
-in the eoEPReduce truncation
-method used in some replacement procedures.
+EP Tournament
+of size T is a global tournament: it works by assigning a score to all
+individuals in the population the following way: starting with a score
+of 0, each individual I is "opposed" T times to a uniformly chosen individual.
+Everytime I wins, its score in incremented by 1 (and by 0.5 for every draw).
+The individuals are then selected deterministically based on their scores
+from that procedure. The EP Tournament
+is implemented in the eoEPReduce
+truncation method used in some replacement procedures.
+Note: whereas both the determinitic
+and the stochastic tournament select one individual, the EP tournament
+is designed for batch selection. Of course it could be used to select a
+single individual, but at a rather high computational cost.
@@ -387,8 +379,7 @@ derives from
Its constructor takes 2 argumenrts:
eoHowMany(double _rate, bool _interpret_as_rate
-=
-true)
+= true)
so by default the double is indeed interpreted as a rate.
It is used in eoSelectMany (which supersedes
eoSelectPerc