From da4a7489f3fe6d37670ee9b5cb6c95b1626e3a29 Mon Sep 17 00:00:00 2001 From: nojhan Date: Mon, 9 Jul 2012 11:29:48 +0200 Subject: [PATCH] bugfix build: build applications, correct prototype for EDA --- edo/CMakeLists.txt | 2 +- edo/application/eda/main.cpp | 5 ++--- edo/test/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/edo/CMakeLists.txt b/edo/CMakeLists.txt index 10b1fbe2..c1798805 100644 --- a/edo/CMakeLists.txt +++ b/edo/CMakeLists.txt @@ -92,7 +92,7 @@ SET(SAMPLE_SRCS) ###################################################################################### ADD_SUBDIRECTORY(src) -#ADD_SUBDIRECTORY(application) +ADD_SUBDIRECTORY(application) ADD_SUBDIRECTORY(test) ADD_SUBDIRECTORY(doc) diff --git a/edo/application/eda/main.cpp b/edo/application/eda/main.cpp index 250e6bf1..cd6b3ed4 100644 --- a/edo/application/eda/main.cpp +++ b/edo/application/eda/main.cpp @@ -162,9 +162,8 @@ int main(int ac, char** av) // EDA algorithm configuration edoAlgo< Distrib >* algo = new edoEDA< Distrib > - (*selector, *estimator, *sampler, - pop_continue, *distribution_continue, - popEval, *replacor); + (popEval, *selector, *estimator, *sampler, *replacor, + pop_continue, *distribution_continue ); // Beginning of the algorithm call try { diff --git a/edo/test/CMakeLists.txt b/edo/test/CMakeLists.txt index 1ceea4f3..7a3129a1 100644 --- a/edo/test/CMakeLists.txt +++ b/edo/test/CMakeLists.txt @@ -33,7 +33,7 @@ LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/application/common) SET(SOURCES - t-cholesky + #t-cholesky t-edoEstimatorNormalMulti t-mean-distance t-bounderno