diff --git a/eo/tutorial/html/eoEngine.html b/eo/tutorial/html/eoEngine.html index 1b6cf46e..0c7e8a4e 100644 --- a/eo/tutorial/html/eoEngine.html +++ b/eo/tutorial/html/eoEngine.html @@ -2,7 +2,7 @@
- +
+
+
Available instances of eoMergeReduce replacement include
Note: The basic use (and initial
+
+
+
Note: The basic use (and initial
motivation) for eoSurviveAndDie
takes 2 arguments, an eoMergeReduce and a number of surviving parents.
It starts by copying the best parents to the new populations, then merges
@@ -457,7 +461,7 @@ 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.
+in selectors.h.
Note: A stochastic tournament with
rate 1.0 is strictly identical to a deterministic tournament of size 2.
diff --git a/eo/tutorial/html/eoOperators.html b/eo/tutorial/html/eoOperators.html
index 87ff6491..4de7b40f 100644
--- a/eo/tutorial/html/eoOperators.html
+++ b/eo/tutorial/html/eoOperators.html
@@ -157,19 +157,15 @@ any useful argument
However, you will hardly have to actually apply operators to individuals,
as operators are used within other classes, and are applied systematically
@@ -228,8 +224,7 @@ above:
However, you will hardly have to actually apply operators to individuals,
as operators are used within other classes, and are applied systematically
@@ -311,8 +306,7 @@ _pop)
+ void apply()(eoPopulator&
_pop)
+ void apply()(eoPopulator&
_pop)
+ void apply()(eoPopulator&
_pop)
Example: An eoSelectivePopulator
is the main ingredient of the eoGeneralBreeder
-operator()
+ where YYY can be one of Proportional and Sequential. Note that before
being added to the container, all simple operators are wrapped into the
-corresponding eoGenOp (see e.g. how an eoMonOpis
+corresponding eoGenOp (see e.g. how an eoMonOpis
wrapped into an eoMonGenOp- or
-how any operator
+how any operator
is handled by calling the appropriate wrapper). In particular, the
wrapper ensures that individuals who have been
modified are invalidated.
diff --git a/eo/tutorial/html/eoProgramming.html b/eo/tutorial/html/eoProgramming.html
index 43593dd9..4c6d9115 100644
--- a/eo/tutorial/html/eoProgramming.html
+++ b/eo/tutorial/html/eoProgramming.html
@@ -312,7 +312,7 @@ numbers who look random (w.r.t. some statistical criteria).
to ensure reproducibility of the results across different platforms, EO
has its own RNG, the ``Mersenne Twister''
random number generator MT19937 (thanks to Takuji
-Nishimura, see eoRNG.h
+Nishimura Though you can define and use as many RNGs as you wish in EO, the library
also provides you with a global RNG termed eo::rng.
@@ -340,7 +340,7 @@ following different probability distribution
(e.g. floating point following normal
distribution). See the complete
list of RNG primitives.
- EO also provides random_generators
+ EO also provides random_generators
that can be used in STL call to generate series of random numbers, as in
eoPop
initializers.
@@ -377,6 +377,8 @@ names of the variables they are used to initialize, e.g.
+ class eoMyClass
{ ... //
eo has been modified
}
-
else
-//
+
else //
eo has not been modified
EOT& parent1 = *_pop;
//
select the first parent
-
++_plop;
-//
+
++_plop; //
advance once for each selected parents
...
EOT& parentN = *_pop;
@@ -357,7 +351,9 @@ were parents, it needs to insert them into the list using the
void apply()(eoPopulator&
+
+
{
// get the necessary number
@@ -395,8 +391,10 @@ outside the curent list, so the total number of (intermediate) offspring
is always equal to the initial population size. By chance, the eoPopulatorhas
a handle on the initial population that was used to start the process,
and you can access it from inside the GenOp method. For instance
-
-
void apply()(eoPopulator&
+
+
+
{
// get as many parents as you
@@ -427,8 +425,10 @@ If you don't care about the size of the offspring population (that is,
if that size os controlled elsewhere, e.g. in some external loop), you
can use the inbedded select method of the class eoPopulator.
For instance
-
-
void apply()(eoPopulator&
+
+
+
{
// get as many parents as you
@@ -569,7 +569,7 @@ to apply the variation operators to the population, and thus get exactly
the number of offspring you want.
+
{
public: