Merge branch 'master' of ssh://localhost:8479/gitroot/eodev/eodev

edo/application/eda/main.cpp

@@ -28,9 +28,6 @@ Authors:
 #include <eo>
 #include <mo>
 
-#include <utils/eoLogger.h>
-#include <utils/eoParserLogger.h>
-
 #include <eoEvalFuncCounterBounder.h>
 
 #include <do/make_pop.h>
@@ -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

edo/application/eda_sa/main.cpp

@@ -1,9 +1,6 @@
 #include <eo>
 #include <mo>
 
-#include <utils/eoLogger.h>
-#include <utils/eoParserLogger.h>
-
 #include <eoEvalFuncCounterBounder.h>
 
 #include <do/make_pop.h>

edo/src/edoAlgo.h

@@ -31,6 +31,8 @@ Authors:
 
 #include <eoAlgo.h>
 
+//! edoAlgo< D >
+
 template < typename D >
 class edoAlgo : public eoAlgo< typename D::EOType >
 {

edo/src/edoBounder.h

@@ -30,6 +30,8 @@ Authors:
 
 #include <eoFunctor.h>
 
+//! edoBounder< EOT >
+
 template < typename EOT >
 class edoBounder : public eoUF< EOT&, void >
 {

edo/src/edoBounderBound.h

@@ -30,6 +30,8 @@ Authors:
 
 #include "edoBounder.h"
 
+//! edoBounderBound< EOT >
+
 template < typename EOT >
 class edoBounderBound : public edoBounder< EOT >
 {

edo/src/edoBounderNo.h

@@ -30,6 +30,8 @@ Authors:
 
 #include "edoBounder.h"
 
+//! edoBounderNo< EOT >
+
 template < typename EOT >
 class edoBounderNo : public edoBounder< EOT >
 {

edo/src/edoBounderRng.h

@@ -30,6 +30,8 @@ Authors:
 
 #include "edoBounder.h"
 
+//! edoBounderRng< EOT >
+
 template < typename EOT >
 class edoBounderRng : public edoBounder< EOT >
 {

edo/src/edoBounderUniform.h

@@ -29,6 +29,8 @@ Authors:
 
 #include "edoBounder.h"
 
+//! edoBounderUniform< EOT >
+
 template < typename EOT >
 class edoBounderUniform : public edoBounder< EOT >
 {

edo/src/edoContinue.h

@@ -31,7 +31,7 @@ Authors:
 #include <eoFunctor.h>
 #include <eoPersistent.h>
 
-//! 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

edo/src/edoDistrib.h

@@ -30,6 +30,8 @@ Authors:
 
 #include <eoFunctor.h>
 
+//! edoDistrib< EOT >
+
 template < typename EOT >
 class edoDistrib : public eoFunctorBase
 {

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 >
 {

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 >
 {

edo/src/edoEstimator.h

@@ -31,6 +31,8 @@ Authors:
 #include <eoPop.h>
 #include <eoFunctor.h>
 
+//! edoEstimator< D >
+
 template < typename D >
 class edoEstimator : public eoUF< eoPop< typename D::EOType >&, D >
 {

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 > >
 {

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 > >
 {

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 > >
 {

edo/src/edoModifier.h

@@ -28,6 +28,8 @@ Authors:
 #ifndef _edoModifier_h
 #define _edoModifier_h
 
+//! edoModifier< D >
+
 template < typename D >
 class edoModifier
 {

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 >
 {

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 >
 {

edo/src/edoNormalMono.h

@@ -30,6 +30,8 @@ Authors:
 
 #include "edoDistrib.h"
 
+//! edoNormalMono< EOT >
+
 template < typename EOT >
 class edoNormalMono : public edoDistrib< EOT >
 {

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 > >
 {

edo/src/edoNormalMulti.h

@@ -15,6 +15,8 @@
 
 namespace ublas = boost::numeric::ublas;
 
+//! edoNormalMulti< EOT >
+
 template < typename EOT >
 class edoNormalMulti : public edoDistrib< EOT >
 {

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 > >
 {

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 >
 {

edo/src/edoSamplerNormalMulti.h

@@ -32,6 +32,8 @@ Authors:
 #include <boost/numeric/ublas/lu.hpp>
 #include <boost/numeric/ublas/symmetric.hpp>
 
+//! edoSamplerNormalMulti< EOT >
+
 template< class EOT >
 class edoSamplerNormalMulti : public edoSampler< edoNormalMulti< EOT > >
 {

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 >
 {

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 > >
 {

edo/src/edoVectorBounds.h

@@ -28,6 +28,8 @@ Authors:
 #ifndef _edoVectorBounds_h
 #define _edoVectorBounds_h
 
+//! edoVectorBounds< EOT >
+
 template < typename EOT >
 class edoVectorBounds
 {

edo/src/utils/edoFileSnapshot.h

@@ -38,6 +38,8 @@ Authors:
 
 #include "utils/eoMonitor.h"
 
+//! edoFileSnapshot
+
 class edoFileSnapshot : public eoMonitor
 {
 public:

edo/src/utils/edoHyperVolume.h

@@ -28,6 +28,8 @@ Authors:
 #ifndef _edoHyperVolume_h
 #define _edoHyperVolume_h
 
+//! edoHyperVolume
+
 template < typename EOT >
 class edoHyperVolume
 {

edo/src/utils/edoStat.h

@@ -30,6 +30,8 @@ Authors:
 
 #include <eoFunctor.h>
 
+//! edoStatBase< D >
+
 template < typename D >
 class edoStatBase : public eoUF< const D&, void >
 {

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 > >
 {

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 > >
 {

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 > >
 {

edo/test/t-edoEstimatorNormalMulti.cpp

@@ -31,9 +31,6 @@ Authors:
 #include <eo>
 #include <mo>
 
-#include <utils/eoLogger.h>
-#include <utils/eoParserLogger.h>
-
 #include <edo>
 
 #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");
 

edo/test/t-mean-distance.cpp

@@ -35,9 +35,6 @@ Authors:
 #include <eo>
 #include <mo>
 
-#include <utils/eoLogger.h>
-#include <utils/eoParserLogger.h>
-
 #include <edo>
 
 #include <boost/numeric/ublas/vector.hpp>
@@ -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");