diff --git a/eo/tutorial/html/FirstBitEA.html b/eo/tutorial/html/FirstBitEA.html
index b659883d..27a4616a 100644
--- a/eo/tutorial/html/FirstBitEA.html
+++ b/eo/tutorial/html/FirstBitEA.html
@@ -9,7 +9,7 @@
Back to Lesson 2 - Tutorial
main page - Top-Down page - Bottom-up
-page - Programming hints - EO
+page - Programming hints - EO
documentation
@@ -356,7 +356,7 @@ The actual code is in boldface and the comment in normal face.
Back to Lesson 2 - Tutorial
main page - Top-Down page - Bottom-up
-page - Programming hints - EO
+page - Programming hints - EO
documentation
diff --git a/eo/tutorial/html/FirstBitGA.html b/eo/tutorial/html/FirstBitGA.html
index 05e859e9..07df1924 100644
--- a/eo/tutorial/html/FirstBitGA.html
+++ b/eo/tutorial/html/FirstBitGA.html
@@ -9,7 +9,7 @@
Back to Lesson 1 - Tutorial
main page - Top-Down page - Bottom-up
-page - Programming hints - EO
+page - Programming hints - EO
documentation
@@ -338,7 +338,7 @@ The actual code is in boldface and the comment in normal face.
Back to Lesson 1 - Tutorial
main page - Top-Down page - Bottom-up
-page - Programming hints - EO
+page - Programming hints - EO
documentation
diff --git a/eo/tutorial/html/FirstRealEA.html b/eo/tutorial/html/FirstRealEA.html
index 9b0372fd..03505b29 100644
--- a/eo/tutorial/html/FirstRealEA.html
+++ b/eo/tutorial/html/FirstRealEA.html
@@ -8,7 +8,7 @@
Back to Lesson 2 - Tutorial
main page - Top-Down page - Bottom-up
-page - Programming hints - EO
+page - Programming hints - EO
documentation
@@ -354,7 +354,7 @@ The actual code is in boldface and the comment in normal face.
Back to Lesson 2 - Tutorial
main page - Top-Down page - Bottom-up
-page - Programming hints - EO
+page - Programming hints - EO
documentation
diff --git a/eo/tutorial/html/FirstRealGA.html b/eo/tutorial/html/FirstRealGA.html
index eaeecc28..7bd1b168 100644
--- a/eo/tutorial/html/FirstRealGA.html
+++ b/eo/tutorial/html/FirstRealGA.html
@@ -9,7 +9,7 @@
Back to Lesson 1 - Tutorial
main page - Top-Down page - Bottom-up
-page - Programming hints - EO
+page - Programming hints - EO
documentation
@@ -337,7 +337,7 @@ The actual code is in boldface and the comment in normal face.
Back to Lesson 1 - Tutorial
main page - Top-Down page - Bottom-up
-page - Programming hints - EO
+page - Programming hints - EO
documentation
diff --git a/eo/tutorial/html/FirstRealGA_old.html b/eo/tutorial/html/FirstRealGA_old.html
index 0609d8c6..3eacbd00 100644
--- a/eo/tutorial/html/FirstRealGA_old.html
+++ b/eo/tutorial/html/FirstRealGA_old.html
@@ -8,7 +8,7 @@
Back to Lesson 1 - Tutorial
main page - Top-Down page - Bottom-up
-page - Programming hints - EO
+page - Programming hints - EO
documentation
@@ -119,7 +119,7 @@ population
// declare the population
eoPop<Indi>
pop;
-
Declares a population
+Declares a population
object, which is basically an STL
vector<Indi>
// fill it!
@@ -146,7 +146,7 @@ pop.push_back(v); // and put it in the population
}
This initialization of the population is straightforward
-
rng.uniform() generates a double uniformly
+
rng.uniform() generates a double uniformly
in [0,1),
v.push_back simply appends its argument
at the end of STL vector v
@@ -161,10 +161,10 @@ population (raw printout)
<< "Initial Population" << endl;
cout
<< pop;
-If you looked at eoPop
-inheritance diagram, you noticed that it derives from eoPrintable:
+
If you looked at eoPop
+inheritance diagram, you noticed that it derives from eoPrintable:
hence you can stream them using the << operator. Of course, Indis
-are EO objects
+are EO objects
, which also are eoPrintable, and the << operator for eoPop
uses the << operator for Indi.
/////////////////////////////////////
@@ -188,8 +188,8 @@ procedure has to be given
generations
eoGenContinue<Indi>
continuator(MAX_GEN);
-This class is called eoGenContinue
-because the main loop of all eoAlgo
+This class is called eoGenContinue
+because the main loop of all eoAlgo
says ... while continuator(pop)
//////////////////////////////////////
//
@@ -204,8 +204,8 @@ offspring(i) is a linear combination of parent(i)
eoArithmeticCrossover<Indi>
xover;
The variation operators are respectively
-an eoMonOp
-(unary operator) and an eoQuadOp
+an eoMonOp
+(unary operator) and an eoQuadOp
(binary operator that modifies both its arguments).
/////////////////////////////////////////
// the algorithm
@@ -266,7 +266,7 @@ e)
Back to Lesson 1 - Tutorial
main page - Top-Down page - Bottom-up
-page - Programming hints - EO
+page - Programming hints - EO
documentation
diff --git a/eo/tutorial/html/Firstmerge.html b/eo/tutorial/html/Firstmerge.html
index 1aca9194..f7709b7a 100644
--- a/eo/tutorial/html/Firstmerge.html
+++ b/eo/tutorial/html/Firstmerge.html
@@ -10,7 +10,7 @@
Tutorial
main page -
Top-Down page - Bottom-up
-page - Programming hints - EO
+page - Programming hints - EO
documentation
@@ -274,7 +274,7 @@ code removed ]
Tutorial
main page -
Top-Down page - Bottom-up
-page - Programming hints - EO
+page - Programming hints - EO
documentation
diff --git a/eo/tutorial/html/NoWay.html b/eo/tutorial/html/NoWay.html
index 60726953..b5ff4ab3 100644
--- a/eo/tutorial/html/NoWay.html
+++ b/eo/tutorial/html/NoWay.html
@@ -9,7 +9,7 @@
Tutorial main page -
Top-Down
page - Bottom-up page - Programming
-hints -EO
+hints -EO
documentation
@@ -61,7 +61,7 @@ you'll probably end up with an executable file named Tutorial main page -
Top-Down
page - Bottom-up page - Programming
-hints - EO
+hints - EO
documentation
diff --git a/eo/tutorial/html/SecondBitEA.html b/eo/tutorial/html/SecondBitEA.html
index 8090e42a..222cc988 100644
--- a/eo/tutorial/html/SecondBitEA.html
+++ b/eo/tutorial/html/SecondBitEA.html
@@ -9,7 +9,7 @@
Back to Lesson 3 - Tutorial
main page - Top-Down page - Bottom-up
-page - Programming hints - EO
+page - Programming hints - EO
documentation
@@ -598,7 +598,7 @@ cout << "Exception: " << e.what() << '\n';
Back to Lesson 3 - Tutorial
main page - Top-Down page - Bottom-up
-page - Programming hints - EO
+page - Programming hints - EO
documentation
diff --git a/eo/tutorial/html/binary_value.html b/eo/tutorial/html/binary_value.html
index 5fd4134c..89d4d965 100644
--- a/eo/tutorial/html/binary_value.html
+++ b/eo/tutorial/html/binary_value.html
@@ -8,7 +8,7 @@
Back to Lesson 2 - Tutorial
main page - Top-Down page - Bottom-up
-page - Programming hints - EO
+page - Programming hints - EO
documentation
@@ -45,7 +45,7 @@ i++)
Back to Lesson 2 - Tutorial
main page - Top-Down page - Bottom-up
-page - Programming hints - EO
+page - Programming hints - EO
documentation
diff --git a/eo/tutorial/html/debut.html b/eo/tutorial/html/debut.html
index e580012b..60f02d48 100644
--- a/eo/tutorial/html/debut.html
+++ b/eo/tutorial/html/debut.html
@@ -8,7 +8,7 @@
Tutorial main page -
Top-Down
page - Bottom-up page - Programming
-hints - EO documentation
+hints - EO documentation
diff --git a/eo/tutorial/html/eoBottomUp.html b/eo/tutorial/html/eoBottomUp.html
index aa150ab5..ef490c9b 100644
--- a/eo/tutorial/html/eoBottomUp.html
+++ b/eo/tutorial/html/eoBottomUp.html
@@ -9,7 +9,7 @@
Tutorial main page -
Top-Down
page - Bottom-up page - Programming
-hints - EO documentation
+hints - EO documentation
@@ -62,7 +62,7 @@ to go directly to the corresponding section of the tutorial.
Tutorial main page - Top-Down
page - Bottom-up page - Programming
-hints - EO documentation
+hints - EO documentation
diff --git a/eo/tutorial/html/eoEval.html b/eo/tutorial/html/eoEval.html
index 7d61f7e7..cf95bb89 100644
--- a/eo/tutorial/html/eoEval.html
+++ b/eo/tutorial/html/eoEval.html
@@ -8,7 +8,7 @@
Tutorial main page -
Top-Down
page - Bottom-up page - Programming
-hints - EO documentation
+hints - EO documentation
@@ -23,7 +23,7 @@ hints - EO documentation
Tutorial main page -
Top-Down
page - Bottom-up page - Programming
-hints - EO documentation
+hints - EO documentation
Marc Schoenauer
diff --git a/eo/tutorial/html/eoInit.html b/eo/tutorial/html/eoInit.html
index 10fa0f44..27cb1a40 100644
--- a/eo/tutorial/html/eoInit.html
+++ b/eo/tutorial/html/eoInit.html
@@ -7,7 +7,7 @@
Tutorial main page -
Top-Down
page - Bottom-up page - Programming
-hints - EO documentation
+hints - EO documentation
@@ -24,7 +24,7 @@ hints - EO documentation
Tutorial main page - Top-Down
page - Bottom-up page - Programming
-hints - EO documentation
+hints - EO documentation
Marc Schoenauer
diff --git a/eo/tutorial/html/eoLesson1.html b/eo/tutorial/html/eoLesson1.html
index 20b2941b..9c45a9fc 100644
--- a/eo/tutorial/html/eoLesson1.html
+++ b/eo/tutorial/html/eoLesson1.html
@@ -10,7 +10,7 @@
Tutorial
main page -
Top-Down page - Bottom-up
-page - Programming hints -EO
+page - Programming hints -EO
documentation
@@ -99,13 +99,13 @@ type of individuals.
os
<< pop streams the pop
onto the ostream os.
-This is true for all objects of of class eoPrintable
+This is true for all objects of of class eoPrintable
(most EO objects) through the method printOn
(which is then called by the <<
operator).
@@ -203,7 +203,7 @@ operator).
Evolution engine:
The selection/replacement mechanism (Bit
- Real) is a simple generational
-GA here: a simple selector, and a generational replacement. The eoDetTournament
+GA here: a simple selector, and a generational replacement. The eoDetTournament
has been chosen as a robust selection, and the generational replacement
(all parents are replaced by the offspring) is hard-coded in the eoSGA
algorithm.
@@ -214,8 +214,8 @@ has been chosen as a robust selection, and the generational replacement
in the simple algorithm considered here, individuals undergo crossover
and mutation.
In EO, these operators are (functor)
-objects of class eoQuadOp
-(binary operator that modifies both its arguments) and eoMonOp
+objects of class eoQuadOp
+(binary operator that modifies both its arguments) and eoMonOp
(unary operator). These operators are applied in turn to all selected
parents, according to user-defined probabilities. These probabilities
are defined with all other parameters, and will
@@ -223,8 +223,8 @@ be passed to the eoSGA<
-
-Bit The crossover eoBinCrossover
-is the standard 1-point crossover, and eoBinMutation
+Bit The crossover eoBinCrossover
+is the standard 1-point crossover, and eoBinMutation
is the standard bit-flip mutation that randomly
flips all bits with a given probability P_MUT_PER_BIT.
@@ -240,10 +240,10 @@ bit, which is specific of the bit-flip mutation. Hence, to run the
same algorithm as Goldberg's SGA, the mutation probability (at individual
level) is 1, and the probability of flipping each bit is P_MUT_PER_BIT.
-
-Real The crossover eoArithmeticCrossover
+Real The crossover eoArithmeticCrossover
is the standard arithmetic crossover for real-valued
vectors, that chooses a point randomly on the segment between both parents
-(also termed BLX-0). eoUniformMutation
+(also termed BLX-0). eoUniformMutation
is the uniform mutation for real-valued vectors
that chooses a new value for each variable uniformly on an interval centered
on the parent value. The width of the interval is an internal
@@ -256,7 +256,7 @@ parameter of the object, here called EPSILON.
Specify a
maximum number of generations
to run (Bit - Real):
the simplest of all stopping criteria at the moment, using an object of
-a sub-class of class eoContinue.
+a sub-class of class eoContinue.
@@ -364,7 +364,7 @@ give bad results!
select;
Note that all these classes of eoObjects are derived from the abstract
class
-eoSelectOne.
+eoSelectOne.
Lessons:
-
@@ -400,7 +400,7 @@ the same sub-dir of dir Tutorial than the lesson itself (see Tutorial
main page -
Top-Down page - Bottom-up
-page - Programming hints - EO
+page - Programming hints - EO
documentation
diff --git a/eo/tutorial/html/eoLesson2.html b/eo/tutorial/html/eoLesson2.html
index fe224e5d..afee4abc 100644
--- a/eo/tutorial/html/eoLesson2.html
+++ b/eo/tutorial/html/eoLesson2.html
@@ -13,7 +13,7 @@
Main page -
Top-Down
- Bottom-up - Hints
-- EO
+- EO
documentation
@@ -99,10 +99,10 @@ rather than maximize a fitness function (see Exercise
of the population is now encapsulatedinto
a separate initializer (based
on a boolean generator or a double-number
-generator -see random_generators.h)
+generator -see random_generators.h)
that is then used in the constructor of the population to build the individuals.
You can also use different initializers and call them in turn through the
-call to pop.append() function
+call to pop.append() function
(see Exercise 2).
Note: Don't
@@ -123,7 +123,7 @@ rates. The class <
xxx is either Mon (for mutation, of class eoMonOp)
or Quad (for crossovers, of class eoQuadOp),
is derived from the corresponding eoxxxOp class. When applying the eoPropCombinedxxxOp,
-one of the eoxxxOp it contains is chosen by a roulette
+one of the eoxxxOp it contains is chosen by a roulette
wheel, according to their respective rates, and is applied to the arguments.
Note: A third optional argument
@@ -179,7 +179,7 @@ to select one individual from a population, its ope
returning a single individual) into an object of the eoSelectPerc
(perc stands for percentage) which allows to select a ... percentage of
a population (his operator()
-returns a population). This was done internally in the constructor
+returns a population). This was done internally in the constructor
of eoSGA - see lesson1.
Exercise
@@ -288,7 +288,7 @@ and stopping criteria here).
Main page -
Top-Down
- Bottom-up - Hints
-- EO
+- EO
documentation
diff --git a/eo/tutorial/html/eoLesson3.html b/eo/tutorial/html/eoLesson3.html
index 04b41467..363196f4 100644
--- a/eo/tutorial/html/eoLesson3.html
+++ b/eo/tutorial/html/eoLesson3.html
@@ -12,7 +12,7 @@
Main page -
Top-Down
- Bottom-up - Hints
-- EO documentation
+- EO documentation
@@ -132,7 +132,7 @@ class, templatized by the type of the variableinteger, double,
yourPrivateClass, ...). In this lesson,
we will not go into details: e.g. we will not tell you that the
-eoValueParam
+eoValueParam
is actually a templatized sub-class of abstract class eoParam (oops, I
said it!), nor will we deal with parameters outside their use from an eoParser.
See the parameter section of the Bottom-up tutorial, or wait until lesson
@@ -259,7 +259,7 @@ class. eoStateeoObjects
that have both an input method (readFrom)
and an output method (printOn),
-i.e. that derive from the base class eoPersistent.
+i.e. that derive from the base class eoPersistent.
You must first register
object into a state, and can then save them to a (text) file, and later
read them from that file using the load
@@ -311,7 +311,7 @@ compute whatever is needed over that population. templatized
over the type of what they compute (e.g. double,
or pair<double>,
-or ...). But looking at the inheritance
+or ...). But looking at the inheritance
diagram of the eoStat
class, you find that eoStat
objects are also eoValueParam
@@ -519,7 +519,7 @@ construct.
Main page -
Top-Down
- Bottom-up - Hints
-- EO documentation
+- EO documentation
diff --git a/eo/tutorial/html/eoProgramming.html b/eo/tutorial/html/eoProgramming.html
index d3fa1f79..9993f329 100644
--- a/eo/tutorial/html/eoProgramming.html
+++ b/eo/tutorial/html/eoProgramming.html
@@ -9,7 +9,7 @@
Tutorial main page -
Top-Down
page - Bottom-up page - Programming
-hints - EO
+hints - EO
documentation
@@ -23,7 +23,7 @@ Library, random numbers, EO programming style!
Templates
-
Most EO code si written using templates. This allows to write generic
+
Most EO code is written using templates. This allows to write generic
code, i.e. involving a class which doesn't have to be known when writing
the code -- but only when compiling it. In some sense this is similar to
naming variables in algebra: you can write a lot of equations involving
@@ -67,7 +67,7 @@ a hierarchy of functions with defaults behaviors and specialized sub-functions
...
-Functors are so intimately linked to EO that a base class (eoFunctorBase)
+Functors are so intimately linked to EO that a base class (eoFunctorBase)
has been designed to hold all functors. This base class is itself divided
into three derived class. These classes tell you immediately what kind
of arguments the operator() method requires
@@ -186,7 +186,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, see eoRNG.h
comments).
Though you can define and use as many RNGs as you wish in EO, the library
also provides you with a global RNG termed rng: using only that single
@@ -211,9 +211,9 @@ related number, e.g. calling time(0), as done for instance in different probability distribution
-(e.g. floating point following normal
+(e.g. floating point following normal
distribution).
-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.
@@ -243,7 +243,7 @@ Blabla
Tutorial main page - Top-Down
page - Bottom-up page - Programming
-hints - EO
+hints - EO
documentation
diff --git a/eo/tutorial/html/eoSGA.html b/eo/tutorial/html/eoSGA.html
index 2d22f794..c7057031 100644
--- a/eo/tutorial/html/eoSGA.html
+++ b/eo/tutorial/html/eoSGA.html
@@ -8,7 +8,7 @@
Back to Lesson 1 - Tutorial
main page - Top-Down page - Bottom-up
-page - Programming hints - EO
+page - Programming hints - EO
documentation
@@ -145,7 +145,7 @@ apply<EOT>(eval, _pop);
Back to Lesson 1 - Tutorial
main page - Top-Down page - Bottom-up
-page - Programming hints - EO
+page - Programming hints - EO
documentation
diff --git a/eo/tutorial/html/eoTopDown.html b/eo/tutorial/html/eoTopDown.html
index cfa8e5d3..478e6bbe 100644
--- a/eo/tutorial/html/eoTopDown.html
+++ b/eo/tutorial/html/eoTopDown.html
@@ -10,7 +10,7 @@
-
Top-Down
page - Bottom-up page - Programming
-hints - EO
+hints - EO
documentation
@@ -75,7 +75,7 @@ not true :-)
Tutorial main page - Top-Down
page - Bottom-up page - Programming
-hints - EO
+hints - EO
documentation
diff --git a/eo/tutorial/html/eoTutorial.html b/eo/tutorial/html/eoTutorial.html
index 31c4cbb2..e395eba6 100644
--- a/eo/tutorial/html/eoTutorial.html
+++ b/eo/tutorial/html/eoTutorial.html
@@ -7,7 +7,7 @@
Top-Down page - Bottom-up
-page - Programming hints - EO
+page - Programming hints - EO
documentation
@@ -48,7 +48,7 @@ There are of course a few (very few) programming
hints that you should know.
-THe EO documentation - automatically
+THe EO documentation - automatically
generated from the comments in the code - is very helpful, to get an idea
of the inheritance diagrams of EO classes, and to quickly reach some specific
part of the code.
@@ -165,7 +165,7 @@ me.
Enjoy!
Top-Down page
- Bottom-up page - Programming
-hints - EO
+hints - EO
documentation
diff --git a/eo/tutorial/html/index.html b/eo/tutorial/html/index.html
index 093aba7d..8d7709de 100644
--- a/eo/tutorial/html/index.html
+++ b/eo/tutorial/html/index.html
@@ -7,7 +7,7 @@
Top-Down page - Bottom-up
-page - Programming hints - EO
+page - Programming hints - EO
documentation
@@ -48,7 +48,7 @@ There are of course a few (very few) programming
hints that you should know.
-THe EO documentation - automatically
+THe EO documentation - automatically
generated from the comments in the code - is very helpful, to get an idea
of the inheritance diagrams of EO classes, and to quickly reach some specific
part of the code.
@@ -165,7 +165,7 @@ me.
Enjoy!
Top-Down page
- Bottom-up page - Programming
-hints - EO
+hints - EO
documentation
diff --git a/eo/tutorial/html/real_value.html b/eo/tutorial/html/real_value.html
index c45ffd05..754aea60 100644
--- a/eo/tutorial/html/real_value.html
+++ b/eo/tutorial/html/real_value.html
@@ -9,7 +9,7 @@
Back to Lesson 2 - Tutorial
main page - Top-Down page - Bottom-up
page - Programming hints -
-EO documentation
+EO documentation
@@ -44,7 +44,7 @@ sum += _ind[i] * _ind[i];
Back to Lesson 2 - Tutorial
main page - Top-Down page - Bottom-up
-page - Programming hints - EO
+page - Programming hints - EO
documentation