diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | dynamical_fit/CMakeLists.txt | 0 | ||||
| -rw-r--r-- | example/CMakeLists.txt | 0 | ||||
| -rw-r--r-- | interface/CMakeLists.txt | 0 | ||||
| -rw-r--r-- | utilities/opt_types.hpp | 20 |
5 files changed, 12 insertions, 10 deletions
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 --- /dev/null +++ b/dynamical_fit/CMakeLists.txt diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/example/CMakeLists.txt diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/interface/CMakeLists.txt 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 <typename Ty,typename Tx,typename Tp,typename Ts,typename Tstr> class opt_types { public: - typedef fitter<Ty,Tx,Tp,Ts,Tstr> fitter; - typedef chisq<Ty,Tx,Tp,Ts,Tstr> chisq; - typedef leastsq<Ty,Tx,Tp,Ts,Tstr> leastsq; - typedef powell_method<Ty,Tp> powell_method; - typedef model<Ty,Tx,Tp,Tstr> model; - typedef default_data_set<Ty,Ty> data_set; - typedef optimizer<Ty,Tp> optimizer; - typedef func_obj<Ty,Tp> func_obj; - typedef opt_method<Ty,Tp> opt_method; + typedef ::opt_utilities::fitter<Ty,Tx,Tp,Ts,Tstr> fitter; + typedef ::opt_utilities::chisq<Ty,Tx,Tp,Ts,Tstr> chisq; + typedef ::opt_utilities::leastsq<Ty,Tx,Tp,Ts,Tstr> leastsq; + typedef ::opt_utilities::powell_method<Ty,Tp> powell_method; + typedef ::opt_utilities::model<Ty,Tx,Tp,Tstr> model; + typedef ::opt_utilities::default_data_set<Ty,Ty> data_set; + typedef ::opt_utilities::optimizer<Ty,Tp> optimizer; + typedef ::opt_utilities::func_obj<Ty,Tp> func_obj; + typedef ::opt_utilities::opt_method<Ty,Tp> opt_method; }; typedef opt_types<double,double,std::vector<double>,double,std::string> dopt; + } |