diff --git a/edo/application/eda/main.cpp b/edo/application/eda/main.cpp index ceb64fb3..4208580e 100644 --- a/edo/application/eda/main.cpp +++ b/edo/application/eda/main.cpp @@ -28,9 +28,6 @@ Authors: #include #include -#include -#include - #include #include @@ -50,7 +47,7 @@ typedef edoNormalMulti< EOT > Distrib; int main(int ac, char** av) { - eoParserLogger parser(ac, av); + eoParser parser(ac, av); // Letters used by the following declarations: // a d i p t diff --git a/edo/application/eda_sa/main.cpp b/edo/application/eda_sa/main.cpp index 8ee173e3..eac52e18 100644 --- a/edo/application/eda_sa/main.cpp +++ b/edo/application/eda_sa/main.cpp @@ -1,9 +1,6 @@ #include #include -#include -#include - #include #include @@ -23,7 +20,7 @@ typedef edoNormalMulti< EOT > Distrib; int main(int ac, char** av) { - eoParserLogger parser(ac, av); + eoParser parser(ac, av); // Letters used by the following declarations: // a d i p t diff --git a/edo/src/edoAlgo.h b/edo/src/edoAlgo.h index 464cb55e..db0c7fe5 100644 --- a/edo/src/edoAlgo.h +++ b/edo/src/edoAlgo.h @@ -31,6 +31,8 @@ Authors: #include +//! edoAlgo< D > + template < typename D > class edoAlgo : public eoAlgo< typename D::EOType > { diff --git a/edo/src/edoBounder.h b/edo/src/edoBounder.h index 3341db5c..0ab5f275 100644 --- a/edo/src/edoBounder.h +++ b/edo/src/edoBounder.h @@ -30,6 +30,8 @@ Authors: #include +//! edoBounder< EOT > + template < typename EOT > class edoBounder : public eoUF< EOT&, void > { diff --git a/edo/src/edoBounderBound.h b/edo/src/edoBounderBound.h index 106748a3..31a4e586 100644 --- a/edo/src/edoBounderBound.h +++ b/edo/src/edoBounderBound.h @@ -30,6 +30,8 @@ Authors: #include "edoBounder.h" +//! edoBounderBound< EOT > + template < typename EOT > class edoBounderBound : public edoBounder< EOT > { diff --git a/edo/src/edoBounderNo.h b/edo/src/edoBounderNo.h index c1a98e71..f0e45454 100644 --- a/edo/src/edoBounderNo.h +++ b/edo/src/edoBounderNo.h @@ -30,6 +30,8 @@ Authors: #include "edoBounder.h" +//! edoBounderNo< EOT > + template < typename EOT > class edoBounderNo : public edoBounder< EOT > { diff --git a/edo/src/edoBounderRng.h b/edo/src/edoBounderRng.h index 8c7bb3ef..2501a212 100644 --- a/edo/src/edoBounderRng.h +++ b/edo/src/edoBounderRng.h @@ -30,6 +30,8 @@ Authors: #include "edoBounder.h" +//! edoBounderRng< EOT > + template < typename EOT > class edoBounderRng : public edoBounder< EOT > { diff --git a/edo/src/edoBounderUniform.h b/edo/src/edoBounderUniform.h index 3af5579f..6501a481 100644 --- a/edo/src/edoBounderUniform.h +++ b/edo/src/edoBounderUniform.h @@ -29,6 +29,8 @@ Authors: #include "edoBounder.h" +//! edoBounderUniform< EOT > + template < typename EOT > class edoBounderUniform : public edoBounder< EOT > { diff --git a/edo/src/edoContinue.h b/edo/src/edoContinue.h index 14b89e61..4f680663 100644 --- a/edo/src/edoContinue.h +++ b/edo/src/edoContinue.h @@ -31,7 +31,7 @@ Authors: #include #include -//! edoContinue< EOT > classe fitted to Distribution Object library +//! edoContinue< D > class fitted to Distribution Object library template < typename D > class edoContinue : public eoUF< const D&, bool >, public eoPersistent diff --git a/edo/src/edoDistrib.h b/edo/src/edoDistrib.h index 5ce9ce06..a6712a4b 100644 --- a/edo/src/edoDistrib.h +++ b/edo/src/edoDistrib.h @@ -30,6 +30,8 @@ Authors: #include +//! edoDistrib< EOT > + template < typename EOT > class edoDistrib : public eoFunctorBase { diff --git a/edo/src/edoEDA.h b/edo/src/edoEDA.h index 21f95f52..51028efc 100644 --- a/edo/src/edoEDA.h +++ b/edo/src/edoEDA.h @@ -39,6 +39,8 @@ Authors: #include "edoSampler.h" #include "edoContinue.h" +//! edoEDA< D > + template < typename D > class edoEDA : public edoAlgo< D > { diff --git a/edo/src/edoEDASA.h b/edo/src/edoEDASA.h index 99da07cd..1d47c57d 100644 --- a/edo/src/edoEDASA.h +++ b/edo/src/edoEDASA.h @@ -39,6 +39,8 @@ Authors: #include "edoSampler.h" #include "edoContinue.h" +//! edoEDASA< D > + template < typename D > class edoEDASA : public edoAlgo< D > { diff --git a/edo/src/edoEstimator.h b/edo/src/edoEstimator.h index c68069ee..ea70e496 100644 --- a/edo/src/edoEstimator.h +++ b/edo/src/edoEstimator.h @@ -31,6 +31,8 @@ Authors: #include #include +//! edoEstimator< D > + template < typename D > class edoEstimator : public eoUF< eoPop< typename D::EOType >&, D > { diff --git a/edo/src/edoEstimatorNormalMono.h b/edo/src/edoEstimatorNormalMono.h index 97036855..6a42114b 100644 --- a/edo/src/edoEstimatorNormalMono.h +++ b/edo/src/edoEstimatorNormalMono.h @@ -31,6 +31,8 @@ Authors: #include "edoEstimator.h" #include "edoNormalMono.h" +//! edoEstimatorNormalMono< EOT > + template < typename EOT > class edoEstimatorNormalMono : public edoEstimator< edoNormalMono< EOT > > { diff --git a/edo/src/edoEstimatorNormalMulti.h b/edo/src/edoEstimatorNormalMulti.h index 6d5eb0ba..cfd979fe 100644 --- a/edo/src/edoEstimatorNormalMulti.h +++ b/edo/src/edoEstimatorNormalMulti.h @@ -32,6 +32,8 @@ Authors: #include "edoEstimator.h" #include "edoNormalMulti.h" +//! edoEstimatorNormalMulti< EOT > + template < typename EOT > class edoEstimatorNormalMulti : public edoEstimator< edoNormalMulti< EOT > > { diff --git a/edo/src/edoEstimatorUniform.h b/edo/src/edoEstimatorUniform.h index 8b61c7bd..4f24bcba 100644 --- a/edo/src/edoEstimatorUniform.h +++ b/edo/src/edoEstimatorUniform.h @@ -33,6 +33,8 @@ Authors: // TODO: calcule de la moyenne + covariance dans une classe derivee +//! edoEstimatorUniform + template < typename EOT > class edoEstimatorUniform : public edoEstimator< edoUniform< EOT > > { diff --git a/edo/src/edoModifier.h b/edo/src/edoModifier.h index 91f7fbe2..12687aa8 100644 --- a/edo/src/edoModifier.h +++ b/edo/src/edoModifier.h @@ -28,6 +28,8 @@ Authors: #ifndef _edoModifier_h #define _edoModifier_h +//! edoModifier< D > + template < typename D > class edoModifier { diff --git a/edo/src/edoModifierDispersion.h b/edo/src/edoModifierDispersion.h index 0d890cbe..a4a6e9ea 100644 --- a/edo/src/edoModifierDispersion.h +++ b/edo/src/edoModifierDispersion.h @@ -33,6 +33,8 @@ Authors: #include "edoModifier.h" +//! edoModifierDispersion< D > + template < typename D > class edoModifierDispersion : public edoModifier< D >, public eoBF< D&, eoPop< typename D::EOType >&, void > { diff --git a/edo/src/edoModifierMass.h b/edo/src/edoModifierMass.h index 414918c7..db9ddcbf 100644 --- a/edo/src/edoModifierMass.h +++ b/edo/src/edoModifierMass.h @@ -32,6 +32,8 @@ Authors: #include "edoModifier.h" +//! edoModifierMass< D > + template < typename D > class edoModifierMass : public edoModifier< D >, public eoBF< D&, typename D::EOType&, void > { diff --git a/edo/src/edoNormalMono.h b/edo/src/edoNormalMono.h index 34c71450..4b015d12 100644 --- a/edo/src/edoNormalMono.h +++ b/edo/src/edoNormalMono.h @@ -30,6 +30,8 @@ Authors: #include "edoDistrib.h" +//! edoNormalMono< EOT > + template < typename EOT > class edoNormalMono : public edoDistrib< EOT > { diff --git a/edo/src/edoNormalMonoCenter.h b/edo/src/edoNormalMonoCenter.h index ac6e75f3..4b415dc0 100644 --- a/edo/src/edoNormalMonoCenter.h +++ b/edo/src/edoNormalMonoCenter.h @@ -31,6 +31,8 @@ Authors: #include "edoModifierMass.h" #include "edoNormalMono.h" +//! edoNormalMonoCenter< EOT > + template < typename EOT > class edoNormalMonoCenter : public edoModifierMass< edoNormalMono< EOT > > { diff --git a/edo/src/edoNormalMulti.h b/edo/src/edoNormalMulti.h index 9a602e73..463f0bc8 100644 --- a/edo/src/edoNormalMulti.h +++ b/edo/src/edoNormalMulti.h @@ -15,6 +15,8 @@ namespace ublas = boost::numeric::ublas; +//! edoNormalMulti< EOT > + template < typename EOT > class edoNormalMulti : public edoDistrib< EOT > { diff --git a/edo/src/edoNormalMultiCenter.h b/edo/src/edoNormalMultiCenter.h index c929ac56..199ded47 100644 --- a/edo/src/edoNormalMultiCenter.h +++ b/edo/src/edoNormalMultiCenter.h @@ -31,6 +31,8 @@ Authors: #include "edoModifierMass.h" #include "edoNormalMulti.h" +//! edoNormalMultiCenter< EOT > + template < typename EOT > class edoNormalMultiCenter : public edoModifierMass< edoNormalMulti< EOT > > { diff --git a/edo/src/edoSampler.h b/edo/src/edoSampler.h index 212e861c..3e4dd0bd 100644 --- a/edo/src/edoSampler.h +++ b/edo/src/edoSampler.h @@ -33,6 +33,8 @@ Authors: #include "edoBounder.h" #include "edoBounderNo.h" +//! edoSampler< D > + template < typename D > class edoSampler : public eoUF< D&, typename D::EOType > { diff --git a/edo/src/edoSamplerNormalMulti.h b/edo/src/edoSamplerNormalMulti.h index 2aa59950..2601ea77 100644 --- a/edo/src/edoSamplerNormalMulti.h +++ b/edo/src/edoSamplerNormalMulti.h @@ -32,6 +32,8 @@ Authors: #include #include +//! edoSamplerNormalMulti< EOT > + template< class EOT > class edoSamplerNormalMulti : public edoSampler< edoNormalMulti< EOT > > { diff --git a/edo/src/edoUniform.h b/edo/src/edoUniform.h index 01cf3cb3..37bf065b 100644 --- a/edo/src/edoUniform.h +++ b/edo/src/edoUniform.h @@ -31,6 +31,8 @@ Authors: #include "edoDistrib.h" #include "edoVectorBounds.h" +//! edoUniform< EOT > + template < typename EOT > class edoUniform : public edoDistrib< EOT >, public edoVectorBounds< EOT > { diff --git a/edo/src/edoUniformCenter.h b/edo/src/edoUniformCenter.h index 22ce9516..473be4b4 100644 --- a/edo/src/edoUniformCenter.h +++ b/edo/src/edoUniformCenter.h @@ -31,6 +31,8 @@ Authors: #include "edoModifierMass.h" #include "edoUniform.h" +//! edoUniformCenter< EOT > + template < typename EOT > class edoUniformCenter : public edoModifierMass< edoUniform< EOT > > { diff --git a/edo/src/edoVectorBounds.h b/edo/src/edoVectorBounds.h index c72a10c2..635132cd 100644 --- a/edo/src/edoVectorBounds.h +++ b/edo/src/edoVectorBounds.h @@ -28,6 +28,8 @@ Authors: #ifndef _edoVectorBounds_h #define _edoVectorBounds_h +//! edoVectorBounds< EOT > + template < typename EOT > class edoVectorBounds { diff --git a/edo/src/utils/edoFileSnapshot.h b/edo/src/utils/edoFileSnapshot.h index 17d04263..7f157f32 100644 --- a/edo/src/utils/edoFileSnapshot.h +++ b/edo/src/utils/edoFileSnapshot.h @@ -38,6 +38,8 @@ Authors: #include "utils/eoMonitor.h" +//! edoFileSnapshot + class edoFileSnapshot : public eoMonitor { public: diff --git a/edo/src/utils/edoHyperVolume.h b/edo/src/utils/edoHyperVolume.h index 85bcf033..2ef73708 100644 --- a/edo/src/utils/edoHyperVolume.h +++ b/edo/src/utils/edoHyperVolume.h @@ -28,6 +28,8 @@ Authors: #ifndef _edoHyperVolume_h #define _edoHyperVolume_h +//! edoHyperVolume + template < typename EOT > class edoHyperVolume { diff --git a/edo/src/utils/edoStat.h b/edo/src/utils/edoStat.h index de5b4d2d..23310132 100644 --- a/edo/src/utils/edoStat.h +++ b/edo/src/utils/edoStat.h @@ -30,6 +30,8 @@ Authors: #include +//! edoStatBase< D > + template < typename D > class edoStatBase : public eoUF< const D&, void > { diff --git a/edo/src/utils/edoStatNormalMono.h b/edo/src/utils/edoStatNormalMono.h index b16b3ae5..87705a0b 100644 --- a/edo/src/utils/edoStatNormalMono.h +++ b/edo/src/utils/edoStatNormalMono.h @@ -31,6 +31,8 @@ Authors: #include "edoStat.h" #include "edoNormalMono.h" +//! edoStatNormalMono< EOT > + template < typename EOT > class edoStatNormalMono : public edoDistribStat< edoNormalMono< EOT > > { diff --git a/edo/src/utils/edoStatNormalMulti.h b/edo/src/utils/edoStatNormalMulti.h index 68af0735..3a653edc 100644 --- a/edo/src/utils/edoStatNormalMulti.h +++ b/edo/src/utils/edoStatNormalMulti.h @@ -33,6 +33,8 @@ Authors: #include "edoStat.h" #include "edoNormalMulti.h" +//! edoStatNormalMulti< EOT > + template < typename EOT > class edoStatNormalMulti : public edoDistribStat< edoNormalMulti< EOT > > { diff --git a/edo/src/utils/edoStatUniform.h b/edo/src/utils/edoStatUniform.h index 8ccb93be..c0fa7935 100644 --- a/edo/src/utils/edoStatUniform.h +++ b/edo/src/utils/edoStatUniform.h @@ -31,6 +31,8 @@ Authors: #include "edoStat.h" #include "edoUniform.h" +//! edoStatUniform< EOT > + template < typename EOT > class edoStatUniform : public edoDistribStat< edoUniform< EOT > > { diff --git a/edo/test/t-edoEstimatorNormalMulti.cpp b/edo/test/t-edoEstimatorNormalMulti.cpp index 431f6f98..91d93296 100644 --- a/edo/test/t-edoEstimatorNormalMulti.cpp +++ b/edo/test/t-edoEstimatorNormalMulti.cpp @@ -31,9 +31,6 @@ Authors: #include #include -#include -#include - #include #include "Rosenbrock.h" @@ -49,7 +46,7 @@ int main(int ac, char** av) // (0) parser + eo routines //----------------------------------------------------- - eoParserLogger parser(ac, av); + eoParser parser(ac, av); std::string section("Algorithm parameters"); diff --git a/edo/test/t-mean-distance.cpp b/edo/test/t-mean-distance.cpp index a69bc8f1..8e62c378 100644 --- a/edo/test/t-mean-distance.cpp +++ b/edo/test/t-mean-distance.cpp @@ -35,9 +35,6 @@ Authors: #include #include -#include -#include - #include #include @@ -56,7 +53,7 @@ int main(int ac, char** av) // (0) parser + eo routines //----------------------------------------------------- - eoParserLogger parser(ac, av); + eoParser parser(ac, av); std::string section("Algorithm parameters"); diff --git a/website/EO_star.svg b/website/EO_star.svg new file mode 100644 index 00000000..30bf3699 --- /dev/null +++ b/website/EO_star.svg @@ -0,0 +1,2647 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + 2007-04-02 + + + Johann "nojhan" Dréo + + + i: initialization, f(X): evaluation, ?: stopping criterion, Se: selection, Cr: cross-over, Mu: mutation, Re: replacement, X*: optimu + + + + + + + + + + + + image/svg+xml + + Evolving Object + 2010-11-02 + + + nojhan + + + en-GB + + An evolutionary algorithmas seen from the evolving objects framework: an interative algorithm that manipulates individuals with the help of operators. Implementing an algorithm consists in assembling operator instances, just as building something with Lego blocks. + +In green are the operators that are ready to use within EO, in yellow the operators that you may need to implement and in red the evaluator, that you should implement. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PEO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + EO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + EO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + EDO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MOEO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PSO + + + + diff --git a/website/index.html b/website/index.html index 3aed1543..5f6aaeca 100644 --- a/website/index.html +++ b/website/index.html @@ -1,77 +1,89 @@ + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - - - - - - - + + + + + + + - Evolving Objects (EO): Evolutionary Computation Framework - + Evolving Objects (EO): Evolutionary Computation Framework - + + -
- Evolving Objects logo - - - - + + + - + diff --git a/website/lightblue.css b/website/lightblue.css index e96546fb..b6802a0e 100644 --- a/website/lightblue.css +++ b/website/lightblue.css @@ -1,14 +1,14 @@ -/*************************************************************************** -* * -* contented3 - An open source xhtml/css website template by Contented * -* Designs. You're free to modify it and use it for any purpose without * -* cost or obligation. We'd prefer that you leave the link to our website * -* in the footer but it's not required. * -* * -* If you have comments or questions, please contact us at * -* http://www.ContentedDesigns.com. Thanks! * -* * -***************************************************************************/ +/**************************************************************************** + * * + * contented3 - An open source xhtml/css website template by Contented * + * Designs. You're free to modify it and use it for any purpose without * + * cost or obligation. We'd prefer that you leave the link to our website * + * in the footer but it's not required. * + * * + * If you have comments or questions, please contact us at * + * http://www.ContentedDesigns.com. Thanks! * + * * + ***************************************************************************/ * { padding:0px; @@ -111,18 +111,18 @@ table { } a { - color: #3366CC; - /*background-color: #FFFFFF;*/ - font-weight: normal; - text-decoration: none; + color: #3366CC; + /*background-color: #FFFFFF;*/ + font-weight: normal; + text-decoration: none; outline:none; } a:hover { - color: #0033CC; - /*background-color: #FFFFFF;*/ - font-weight: normal; - text-decoration: underline; + color: #0033CC; + /*background-color: #FFFFFF;*/ + font-weight: normal; + text-decoration: underline; } @@ -133,12 +133,12 @@ a:hover { } #title { - color:#3366CC; - /*background-color:#FFFFFF;*/ - font-size:3em; - font-weight:bold; - margin:0px 0px 10px 0px; - float:left; + color:#3366CC; + /*background-color:#FFFFFF;*/ + font-size:3em; + font-weight:bold; + margin:0px 0px 10px 0px; + float:left; } #slogan { @@ -170,7 +170,7 @@ ul#menu { margin: 0; padding: 0; list-style: none; - /*width:650px;*/ +/*width:650px;*/ } ul#menu li { @@ -201,7 +201,7 @@ ul#menu a.selected:visited { background: #3366CC; color: #FFFFFF; } padding:1em; margin:1em; /*width:650px; - float:left;*/ + float:left;*/ clear:left; } @@ -217,16 +217,16 @@ ul#menu a.selected:visited { background: #3366CC; color: #FFFFFF; } } #foot a { - color:#3366CC; - background-color:#FFFFFF; - text-decoration: none; + color:#3366CC; + background-color:#FFFFFF; + text-decoration: none; } #foot a:hover { - color:#0033CC; - background-color:#FFFFFF; - font-weight: normal; - text-decoration: underline; + color:#0033CC; + background-color:#FFFFFF; + font-weight: normal; + text-decoration: underline; } #copyright { @@ -248,10 +248,10 @@ ul#menu a.selected:visited { background: #3366CC; color: #FFFFFF; } font-weight:bold; } - .table_form_label { +.table_form_label { text-align:right; padding-right:1em; - } +} .table_form_submit { text-align:center;