From 55d6b3a31607ba104f58585f2135ed24eb528611 Mon Sep 17 00:00:00 2001 From: astrojhgu Date: Thu, 27 May 2010 06:40:51 +0000 Subject: git-svn-id: file:///home/svn/opt_utilities@116 ed2142bd-67ad-457f-ba7c-d818d4011675 --- CMakeLists.txt | 2 +- dynamical_fit/CMakeLists.txt | 0 example/CMakeLists.txt | 0 interface/CMakeLists.txt | 0 utilities/opt_types.hpp | 20 +++++++++++--------- 5 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 dynamical_fit/CMakeLists.txt create mode 100644 example/CMakeLists.txt create mode 100644 interface/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index c5909e6..a9a8ec6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ add_subdirectory(dynamical_fit) include_directories (${PROJECT_SOURCE_DIR} ${LTDL_INCLUDE_DIRS}) -message(${LTDL_LIBRARIES}) +#message(${LTDL_LIBRARIES}) set(LIBRARY_OUTPUT_PATH,lib) ADD_LIBRARY(opt STATIC interface/opt.cc) ADD_EXECUTABLE(test_fitter example/test_fitter.cpp) diff --git a/dynamical_fit/CMakeLists.txt b/dynamical_fit/CMakeLists.txt new file mode 100644 index 0000000..e69de29 diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt new file mode 100644 index 0000000..e69de29 diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt new file mode 100644 index 0000000..e69de29 diff --git a/utilities/opt_types.hpp b/utilities/opt_types.hpp index 2f275f5..604b62a 100644 --- a/utilities/opt_types.hpp +++ b/utilities/opt_types.hpp @@ -11,22 +11,24 @@ namespace opt_utilities { + template class opt_types { public: - typedef fitter fitter; - typedef chisq chisq; - typedef leastsq leastsq; - typedef powell_method powell_method; - typedef model model; - typedef default_data_set data_set; - typedef optimizer optimizer; - typedef func_obj func_obj; - typedef opt_method opt_method; + typedef ::opt_utilities::fitter fitter; + typedef ::opt_utilities::chisq chisq; + typedef ::opt_utilities::leastsq leastsq; + typedef ::opt_utilities::powell_method powell_method; + typedef ::opt_utilities::model model; + typedef ::opt_utilities::default_data_set data_set; + typedef ::opt_utilities::optimizer optimizer; + typedef ::opt_utilities::func_obj func_obj; + typedef ::opt_utilities::opt_method opt_method; }; typedef opt_types,double,std::string> dopt; + } -- cgit v1.2.2