+ lib utils

src/CMakeLists.txt

@@ -10,3 +10,12 @@ FILE(GLOB SOURCES *.cpp)
 SET(SAMPLE_SRCS ${SOURCES} PARENT_SCOPE)
 
 ######################################################################################
+
+
+######################################################################################
+### 2) Where must cmake go now ?
+######################################################################################
+
+ADD_SUBDIRECTORY(utils)
+
+######################################################################################

src/TODO

@@ -1,2 +1 @@
-* deplacer les ecritures pour gnuplot dans des classes type eoContinue (eoMonitor)
 * integrer ACP

src/do

@@ -41,14 +41,14 @@
 #include "doBounderRng.h"
 
 #include "doContinue.h"
-#include "doCheckPoint.h"
+#include "utils/doCheckPoint.h"
 
-#include "doStat.h"
+#include "utils/doStat.h"
-#include "doStatUniform.h"
+#include "utils/doStatUniform.h"
-#include "doStatNormalMono.h"
+#include "utils/doStatNormalMono.h"
-#include "doStatNormalMulti.h"
+#include "utils/doStatNormalMulti.h"
 
-#include "doFileSnapshot.h"
+#include "utils/doFileSnapshot.h"
-#include "doPopStat.h"
+#include "utils/doPopStat.h"
 
 #endif // !_do_

src/doContinue.h

@@ -9,10 +9,9 @@
 #define _doContinue_h
 
 #include <eoFunctor.h>
-#include <eoPop.h>
 #include <eoPersistent.h>
 
-//! eoContinue< EOT > classe fitted to Distribution Object library
+//! doContinue< EOT > classe fitted to Distribution Object library
 
 template < typename D >
 class doContinue : public eoUF< const D&, bool >, public eoPersistent
@@ -36,7 +35,7 @@ class doDummyContinue : public doContinue< D >
 {
     bool operator()(const D&){ return true; }
 
-    virtual std::string className() const { return "doNoContinue"; }
+    virtual std::string className() const { return "doDummyContinue"; }
 };
 
 #endif // !_doContinue_h

src/doEDASA.h

@@ -17,8 +17,6 @@
 #include "doEstimator.h"
 #include "doModifierMass.h"
 #include "doSampler.h"
-#include "doHyperVolume.h"
-#include "doStat.h"
 #include "doContinue.h"
 
 template < typename D >

src/utils/CMakeLists.txt

@@ -0,0 +1,14 @@
+######################################################################################
+### 1) Set all needed source files for the project
+######################################################################################
+
+FILE(GLOB SOURCES *.cpp)
+
+SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
+ADD_LIBRARY(doutils ${SOURCES})
+INSTALL(TARGETS doutils ARCHIVE DESTINATION lib COMPONENT libraries)
+
+FILE(GLOB HDRS *.h utils)
+INSTALL(FILES ${HDRS} DESTINATION include/do/utils COMPONENT headers)
+
+######################################################################################

src/utils/doFileSnapshot.cpp

@@ -30,7 +30,7 @@
 #include <fstream>
 #include <stdexcept>
 
-#include <doFileSnapshot.h>
+#include <utils/doFileSnapshot.h>
 #include <utils/compatibility.h>
 #include <utils/eoParam.h>