From 5b3f42d277fb1bce08cab7dd767530049630eb2d Mon Sep 17 00:00:00 2001 From: Caner Candan Date: Tue, 24 Aug 2010 10:26:36 +0200 Subject: [PATCH] + lib utils --- src/CMakeLists.txt | 9 +++++++++ src/TODO | 1 - src/do | 14 +++++++------- src/doContinue.h | 5 ++--- src/doEDASA.h | 2 -- src/utils/CMakeLists.txt | 14 ++++++++++++++ src/{ => utils}/doCheckPoint.h | 0 src/{ => utils}/doFileSnapshot.cpp | 2 +- src/{ => utils}/doFileSnapshot.h | 0 src/{ => utils}/doHyperVolume.h | 0 src/{ => utils}/doPopStat.h | 0 src/{ => utils}/doStat.h | 0 src/{ => utils}/doStatNormalMono.h | 0 src/{ => utils}/doStatNormalMulti.h | 0 src/{ => utils}/doStatUniform.h | 0 15 files changed, 33 insertions(+), 14 deletions(-) create mode 100644 src/utils/CMakeLists.txt rename src/{ => utils}/doCheckPoint.h (100%) rename src/{ => utils}/doFileSnapshot.cpp (98%) rename src/{ => utils}/doFileSnapshot.h (100%) rename src/{ => utils}/doHyperVolume.h (100%) rename src/{ => utils}/doPopStat.h (100%) rename src/{ => utils}/doStat.h (100%) rename src/{ => utils}/doStatNormalMono.h (100%) rename src/{ => utils}/doStatNormalMulti.h (100%) rename src/{ => utils}/doStatUniform.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8b6d787a..f4cdbfae 100644 --- a/src/CMakeLists.txt +++ b/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) + +###################################################################################### diff --git a/src/TODO b/src/TODO index 13785cc8..bed1db02 100644 --- a/src/TODO +++ b/src/TODO @@ -1,2 +1 @@ -* deplacer les ecritures pour gnuplot dans des classes type eoContinue (eoMonitor) * integrer ACP diff --git a/src/do b/src/do index e96262c9..bcd43e19 100644 --- a/src/do +++ b/src/do @@ -41,14 +41,14 @@ #include "doBounderRng.h" #include "doContinue.h" -#include "doCheckPoint.h" +#include "utils/doCheckPoint.h" -#include "doStat.h" -#include "doStatUniform.h" -#include "doStatNormalMono.h" -#include "doStatNormalMulti.h" +#include "utils/doStat.h" +#include "utils/doStatUniform.h" +#include "utils/doStatNormalMono.h" +#include "utils/doStatNormalMulti.h" -#include "doFileSnapshot.h" -#include "doPopStat.h" +#include "utils/doFileSnapshot.h" +#include "utils/doPopStat.h" #endif // !_do_ diff --git a/src/doContinue.h b/src/doContinue.h index a93de093..64f1d483 100644 --- a/src/doContinue.h +++ b/src/doContinue.h @@ -9,10 +9,9 @@ #define _doContinue_h #include -#include #include -//! 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 diff --git a/src/doEDASA.h b/src/doEDASA.h index 25fc5e5d..ae2e39cd 100644 --- a/src/doEDASA.h +++ b/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 > diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt new file mode 100644 index 00000000..48a65519 --- /dev/null +++ b/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) + +###################################################################################### diff --git a/src/doCheckPoint.h b/src/utils/doCheckPoint.h similarity index 100% rename from src/doCheckPoint.h rename to src/utils/doCheckPoint.h diff --git a/src/doFileSnapshot.cpp b/src/utils/doFileSnapshot.cpp similarity index 98% rename from src/doFileSnapshot.cpp rename to src/utils/doFileSnapshot.cpp index 6d0578e8..6879d75e 100644 --- a/src/doFileSnapshot.cpp +++ b/src/utils/doFileSnapshot.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include diff --git a/src/doFileSnapshot.h b/src/utils/doFileSnapshot.h similarity index 100% rename from src/doFileSnapshot.h rename to src/utils/doFileSnapshot.h diff --git a/src/doHyperVolume.h b/src/utils/doHyperVolume.h similarity index 100% rename from src/doHyperVolume.h rename to src/utils/doHyperVolume.h diff --git a/src/doPopStat.h b/src/utils/doPopStat.h similarity index 100% rename from src/doPopStat.h rename to src/utils/doPopStat.h diff --git a/src/doStat.h b/src/utils/doStat.h similarity index 100% rename from src/doStat.h rename to src/utils/doStat.h diff --git a/src/doStatNormalMono.h b/src/utils/doStatNormalMono.h similarity index 100% rename from src/doStatNormalMono.h rename to src/utils/doStatNormalMono.h diff --git a/src/doStatNormalMulti.h b/src/utils/doStatNormalMulti.h similarity index 100% rename from src/doStatNormalMulti.h rename to src/utils/doStatNormalMulti.h diff --git a/src/doStatUniform.h b/src/utils/doStatUniform.h similarity index 100% rename from src/doStatUniform.h rename to src/utils/doStatUniform.h