diff --git a/eo/doc/mainpage.html b/eo/doc/mainpage.html
index ef0711e4d..da5ed2608 100644
--- a/eo/doc/mainpage.html
+++ b/eo/doc/mainpage.html
@@ -260,11 +260,11 @@
diff --git a/eo/src/eoBreed.h b/eo/src/eoBreed.h
index 8eca4b11d..c62cb213d 100644
--- a/eo/src/eoBreed.h
+++ b/eo/src/eoBreed.h
@@ -33,20 +33,24 @@
#include
//-----------------------------------------------------------------------------
-/**
-eoBreed: breeding is thought of a combination of selecting and transforming
-a population. For efficiency reasons you might want to build your own
-eoBreed derived class rather than relying on a seperate select and transform
-function.
+/** Breeding: combination of selecting and transforming a population
- @see eoSelect, eoTransform, eoSelectTransform
+Breeding is thought of a combination of selecting and transforming a
+population. For efficiency reasons you might want to build your own
+eoBreed derived class rather than relying on a seperate select and
+transform function.
+
+@see eoSelect, eoTransform, eoSelectTransform
*/
template
class eoBreed : public eoBF&, eoPop&, void>
{};
-/**
-eoSelectTransform: special breeder that is just an application of an embedded select,
+
+
+/** Embedded select, followed by an embedded transform
+
+Special breeder that is just an application of an embedded select,
followed by an embedded transform
*/
template
diff --git a/eo/src/eoEasyEA.h b/eo/src/eoEasyEA.h
index 50a9ad5d8..9dd28148b 100644
--- a/eo/src/eoEasyEA.h
+++ b/eo/src/eoEasyEA.h
@@ -3,7 +3,7 @@
//-----------------------------------------------------------------------------
// eoEasyEA.h
// (c) GeNeura Team, 1998
-/*
+/*
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
@@ -47,9 +47,9 @@ template class eoDistEvalEasyEA ;
/** An easy-to-use evolutionary algorithm; you can use any chromosome,
and any selection transformation, merging and evaluation
algorithms; you can even change in runtime parameters of those
- sub-algorithms
+ sub-algorithms
-Change (MS, July 3. 2001):
+Change (MS, July 3. 2001):
Replaced the eoEvalFunc by an eoPopEvalFunc: this immediately
allows many useful constructs, such as co-evolution (e.g. game players),
parisian approach (the solution to the problem is the whole population)
@@ -68,8 +68,8 @@ public:
eoContinue& _continuator,
eoEvalFunc& _eval,
eoBreed& _breed,
- eoReplacement& _replace
- ) : continuator(_continuator),
+ eoReplacement& _replace
+ ) : continuator(_continuator),
eval (_eval),
loopEval(_eval),
popEval(loopEval),
@@ -83,9 +83,9 @@ public:
eoEasyEA(eoContinue & _continuator,
eoPopEvalFunc & _pop_eval,
eoBreed & _breed,
- eoReplacement & _replace
+ eoReplacement & _replace
) :
- continuator (_continuator),
+ continuator (_continuator),
eval (dummyEval),
loopEval(dummyEval),
popEval (_pop_eval),
@@ -93,7 +93,7 @@ public:
breed (_breed),
mergeReduce (dummyMerge, dummyReduce),
replace (_replace) {
-
+
}
*/
@@ -102,9 +102,9 @@ public:
eoContinue& _continuator,
eoPopEvalFunc& _eval,
eoBreed& _breed,
- eoReplacement& _replace
+ eoReplacement& _replace
) : continuator(_continuator),
- eval (dummyEval),
+ eval (dummyEval),
loopEval(dummyEval),
popEval(_eval),
selectTransform(dummySelect, dummyTransform),
@@ -136,7 +136,7 @@ public:
eoEvalFunc& _eval,
eoSelect& _select,
eoTransform& _transform,
- eoReplacement& _replace
+ eoReplacement& _replace
) : continuator(_continuator),
eval (_eval),
loopEval(_eval),
@@ -171,13 +171,13 @@ public:
/// Apply a few generation of evolution to the population.
virtual void operator()(eoPop& _pop)
{
- eoPop offspring, empty_pop;
+ eoPop offspring, empty_pop;
popEval(empty_pop, _pop); // A first eval of pop.
do
{
try
{
- unsigned pSize = _pop.size();
+ unsigned pSize = _pop.size();
offspring.clear(); // new offspring
breed(_pop, offspring);
@@ -202,7 +202,7 @@ public:
}
protected :
-
+
// If selectTransform needs not be used, dummySelect and dummyTransform are used
// to instantiate it.
class eoDummySelect : public eoSelect
@@ -215,15 +215,15 @@ protected :
{public: void operator()(EOT &) {} } dummyEval;
eoContinue& continuator;
-
+
eoEvalFunc & eval ;
- eoPopLoopEval loopEval;
+ eoPopLoopEval loopEval;
eoPopEvalFunc& popEval;
-
+
eoSelectTransform selectTransform;
eoBreed& breed;
-
+
// If mergeReduce needs not be used, dummyMerge and dummyReduce are used
// to instantiate it.
eoNoElitism dummyMerge;
@@ -231,7 +231,7 @@ protected :
eoMergeReduce mergeReduce;
eoReplacement& replace;
-
+
// Friend classes
friend class eoIslandsEasyEA ;
friend class eoDistEvalEasyEA ;