From 7a47fd55b9aa68b33557bcc6c9f323cf0cafa1dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Sav=C3=A9ant?= Date: Wed, 18 Jul 2012 11:50:29 +0200 Subject: [PATCH] remove mo package dependency --- edo/CMakeLists.txt | 2 +- edo/application/cmaes/main.cpp | 2 +- edo/build_gcc_linux_release | 3 ++- edo/src/edoEDA.h | 2 +- edo/src/edoEDASA.h | 2 +- edo/src/utils/edoStatNormalMulti.h | 2 +- edo/test/t-edoEstimatorNormalMulti.cpp | 2 +- edo/test/t-mean-distance.cpp | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/edo/CMakeLists.txt b/edo/CMakeLists.txt index 9a07cd619..3cb182b3d 100644 --- a/edo/CMakeLists.txt +++ b/edo/CMakeLists.txt @@ -125,7 +125,7 @@ SET(SAMPLE_SRCS) ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(application) -ADD_SUBDIRECTORY(test) +#ADD_SUBDIRECTORY(test) ADD_SUBDIRECTORY(doc) ###################################################################################### diff --git a/edo/application/cmaes/main.cpp b/edo/application/cmaes/main.cpp index 18c3f093f..d1f35941c 100644 --- a/edo/application/cmaes/main.cpp +++ b/edo/application/cmaes/main.cpp @@ -26,7 +26,7 @@ Authors: */ #include -#include +//#include #include diff --git a/edo/build_gcc_linux_release b/edo/build_gcc_linux_release index fb220d044..cf311d461 100755 --- a/edo/build_gcc_linux_release +++ b/edo/build_gcc_linux_release @@ -2,6 +2,7 @@ mkdir -p release cd release -cmake .. +#cmake -DWITH_EIGEN=1 .. +cmake -DWITH_BOOST=1 .. make cd .. diff --git a/edo/src/edoEDA.h b/edo/src/edoEDA.h index f94e828f5..c0c75be23 100644 --- a/edo/src/edoEDA.h +++ b/edo/src/edoEDA.h @@ -29,7 +29,7 @@ Authors: #define _edoEDA_h #include -#include +//#include #include diff --git a/edo/src/edoEDASA.h b/edo/src/edoEDASA.h index b2f0fe708..27ae80620 100644 --- a/edo/src/edoEDASA.h +++ b/edo/src/edoEDASA.h @@ -29,7 +29,7 @@ Authors: #define _edoEDASA_h #include -#include +//#include #include diff --git a/edo/src/utils/edoStatNormalMulti.h b/edo/src/utils/edoStatNormalMulti.h index bc5066ac7..d46e97ef5 100644 --- a/edo/src/utils/edoStatNormalMulti.h +++ b/edo/src/utils/edoStatNormalMulti.h @@ -50,7 +50,7 @@ template < typename EOT > class edoStatNormalMulti : public edoDistribStat< edoNormalMulti< EOT > > { public: - typedef typename EOT::AtomType AtomType; + // typedef typename EOT::AtomType AtomType; using edoDistribStat< edoNormalMulti< EOT > >::value; diff --git a/edo/test/t-edoEstimatorNormalMulti.cpp b/edo/test/t-edoEstimatorNormalMulti.cpp index 114f8fa17..5c47f5cf5 100644 --- a/edo/test/t-edoEstimatorNormalMulti.cpp +++ b/edo/test/t-edoEstimatorNormalMulti.cpp @@ -29,7 +29,7 @@ Authors: #include #include -#include +//#include #include diff --git a/edo/test/t-mean-distance.cpp b/edo/test/t-mean-distance.cpp index ae6de0eb3..4e184f5a8 100644 --- a/edo/test/t-mean-distance.cpp +++ b/edo/test/t-mean-distance.cpp @@ -33,7 +33,7 @@ Authors: #include #include -#include +//#include #include