Merge branch 'master' into cmaes

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)
 

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 {

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