diff options
46 files changed, 53 insertions, 10 deletions
diff --git a/core/fitter.hpp b/core/fitter.hpp index 874e4d0..398282d 100644 --- a/core/fitter.hpp +++ b/core/fitter.hpp @@ -4,6 +4,7 @@ #ifndef FITTER_HPP
#define FITTER_HPP
+#define OPT_HEADER
#include "opt_exception.hpp"
#include "optimizer.hpp"
#include <vector>
diff --git a/core/freeze_param.hpp b/core/freeze_param.hpp index 4f7cc8c..6a4f309 100644 --- a/core/freeze_param.hpp +++ b/core/freeze_param.hpp @@ -4,6 +4,7 @@ #ifndef FREEZE_PARAM_HPP #define FREEZE_PARAM_HPP +#define OPT_HEADER #include "fitter.hpp" #include <vector> #include <set> diff --git a/core/num_diff.hpp b/core/num_diff.hpp index d6db632..27a1674 100644 --- a/core/num_diff.hpp +++ b/core/num_diff.hpp @@ -5,7 +5,7 @@ #ifndef NUMDIFF_HPP #define NUMDIFF_HPP - +#define OPT_HEADER #include <core/optimizer.hpp> #include <core/opt_traits.hpp> #include <algorithm> diff --git a/core/opt_exception.hpp b/core/opt_exception.hpp index e20e209..027f783 100644 --- a/core/opt_exception.hpp +++ b/core/opt_exception.hpp @@ -4,6 +4,7 @@ #ifndef OPT_EXCEPTION #define OPT_EXCEPTION +#define OPT_HEADER #include <string> #include <exception> namespace opt_utilities diff --git a/core/opt_traits.hpp b/core/opt_traits.hpp index c660208..44aaa37 100644 --- a/core/opt_traits.hpp +++ b/core/opt_traits.hpp @@ -4,6 +4,7 @@ #ifndef ARRAY_OPERATION #define ARRAY_OPERATION +#define OPT_HEADER #include <cstddef> namespace opt_utilities { diff --git a/core/optimizer.hpp b/core/optimizer.hpp index 9ae2860..871da7b 100644 --- a/core/optimizer.hpp +++ b/core/optimizer.hpp @@ -4,9 +4,9 @@ */ -#ifndef OPTIMZER_H_ -#define OPTIMZER_H_ -//#define DEBUG +#ifndef OPTIMZER_HPP +#define OPTIMZER_HPP +#define OPT_HEADER #include <cstddef> #include "opt_traits.hpp" #include "opt_exception.hpp" diff --git a/data_sets/default_data_set.hpp b/data_sets/default_data_set.hpp index 2df7668..f369cee 100644 --- a/data_sets/default_data_set.hpp +++ b/data_sets/default_data_set.hpp @@ -4,6 +4,7 @@ #ifndef DEFAULT_DATA_SET #define DEFAULT_DATA_SET +#define OPT_HEADER #include "core/fitter.hpp" #include <vector> diff --git a/data_sets/sorted_data_set.hpp b/data_sets/sorted_data_set.hpp index 1416d68..2e0c3cc 100644 --- a/data_sets/sorted_data_set.hpp +++ b/data_sets/sorted_data_set.hpp @@ -4,6 +4,7 @@ #ifndef SORTED_DATA_SET #define SORTED_DATA_SET +#define OPT_HEADER #include "core/fitter.hpp" #include <vector> #include <algorithm> diff --git a/methods/aga/aga.hpp b/methods/aga/aga.hpp index 5dba423..0cde38d 100644 --- a/methods/aga/aga.hpp +++ b/methods/aga/aga.hpp @@ -5,6 +5,7 @@ #ifndef AGA_METHOD #define AGA_METHOD +#define OPT_HEADER #include <core/optimizer.hpp> //#include <blitz/array.h> #include <limits> diff --git a/methods/gsl_simplex/gsl_simplex.hpp b/methods/gsl_simplex/gsl_simplex.hpp index 4b9295f..cb26ac6 100644 --- a/methods/gsl_simplex/gsl_simplex.hpp +++ b/methods/gsl_simplex/gsl_simplex.hpp @@ -4,6 +4,7 @@ #ifndef GSL_SIMPLEX_METHOD #define GSL_SIMPLEX_METHOD +#define OPT_HEADER #include <core/optimizer.hpp> //#include <blitz/array.h> #include <vector> diff --git a/methods/powell/bas_util.hpp b/methods/powell/bas_util.hpp index 6a53f0a..ccdce9e 100644 --- a/methods/powell/bas_util.hpp +++ b/methods/powell/bas_util.hpp @@ -1,5 +1,6 @@ #ifndef BAS_UTIL #define BAS_UTIL +#define OPT_HEADER #include <core/opt_traits.hpp> #include <algorithm> namespace opt_utilities diff --git a/methods/powell/brent.hpp b/methods/powell/brent.hpp index cb3b962..1a0ee39 100644 --- a/methods/powell/brent.hpp +++ b/methods/powell/brent.hpp @@ -1,5 +1,6 @@ #ifndef BRENT_HPP #define BRENT_HPP +#define OPT_HEADER #include <iostream> #include "bas_util.hpp" //#include "optimizer.hpp" diff --git a/methods/powell/linmin.hpp b/methods/powell/linmin.hpp index 286405a..bde12c6 100644 --- a/methods/powell/linmin.hpp +++ b/methods/powell/linmin.hpp @@ -1,5 +1,6 @@ #ifndef LINMIN_HPP #define LINMIN_HPP +#define OPT_HEADER #include "mnbrak.hpp" #include "brent.hpp" #include <core/opt_traits.hpp> diff --git a/methods/powell/mnbrak.hpp b/methods/powell/mnbrak.hpp index 4887bec..9871473 100644 --- a/methods/powell/mnbrak.hpp +++ b/methods/powell/mnbrak.hpp @@ -1,5 +1,6 @@ #ifndef MNBRAK_HPP #define MNBRAK_HPP +#define OPT_HEADER //#include "optimizer.hpp" #include "bas_util.hpp" namespace opt_utilities diff --git a/methods/powell/powell_method.hpp b/methods/powell/powell_method.hpp index eb5c498..6256b5b 100644 --- a/methods/powell/powell_method.hpp +++ b/methods/powell/powell_method.hpp @@ -4,6 +4,7 @@ #ifndef POWELL_METHOD #define POWELL_METHOD +#define OPT_HEADER #include <core/optimizer.hpp> //#include <blitz/array.h> #include <limits> diff --git a/misc/bootstrap.hpp b/misc/bootstrap.hpp index c6a399d..4d74ac3 100644 --- a/misc/bootstrap.hpp +++ b/misc/bootstrap.hpp @@ -5,6 +5,7 @@ #ifndef BOOT_STRIP #define BOOT_STRIP +#define OPT_HEADER #include <core/fitter.hpp> #include <vector> #include <cstdlib> diff --git a/misc/data_loaders.hpp b/misc/data_loaders.hpp index 0347252..20405b1 100644 --- a/misc/data_loaders.hpp +++ b/misc/data_loaders.hpp @@ -5,6 +5,7 @@ #ifndef DATA_LOADERS_H #define DATA_LOADERS_H +#define OPT_HEADER #include <core/fitter.hpp> #include <data_sets/default_data_set.hpp> #include <iostream> diff --git a/models/add_model.hpp b/models/add_model.hpp index 7e4a6c7..46aa76c 100644 --- a/models/add_model.hpp +++ b/models/add_model.hpp @@ -1,5 +1,6 @@ #ifndef ADD_MODEL_H_ #define ADD_MODEL_H_ +#define OPT_HEADER #include <core/fitter.hpp> #include <cmath> diff --git a/models/beta1d.hpp b/models/beta1d.hpp index 418722f..79e9a67 100644 --- a/models/beta1d.hpp +++ b/models/beta1d.hpp @@ -1,5 +1,6 @@ #ifndef BETA_MODEL_H_ #define BETA_MODEL_H_ +#define OPT_HEADER #include <core/fitter.hpp> #include <cmath> #include <iostream> diff --git a/models/beta2d.hpp b/models/beta2d.hpp index 650e179..2955e75 100644 --- a/models/beta2d.hpp +++ b/models/beta2d.hpp @@ -1,5 +1,6 @@ #ifndef BETA_MODEL2d_H_ #define BETA_MODEL2d_H_ +#define OPT_HEADER #include <core/fitter.hpp> #include <cmath> #include <cassert> diff --git a/models/beta2d2.hpp b/models/beta2d2.hpp index ab5c4bb..860d986 100644 --- a/models/beta2d2.hpp +++ b/models/beta2d2.hpp @@ -1,5 +1,6 @@ #ifndef BETA_MODEL2d2_H_ #define BETA_MODEL2d2_H_ +#define OPT_HEADER #include <core/fitter.hpp> #include <cmath> #include <cassert> diff --git a/models/bl1d.hpp b/models/bl1d.hpp index 2f6afb5..6dd24b3 100644 --- a/models/bl1d.hpp +++ b/models/bl1d.hpp @@ -1,5 +1,6 @@ #ifndef BROKEN_LINE_MODEL_H_ #define BROKEN_LINE_MODEL_H_ +#define OPT_HEADER #include <core/fitter.hpp> #include <cmath> diff --git a/models/bpl1d.hpp b/models/bpl1d.hpp index be32d8a..1c34016 100644 --- a/models/bpl1d.hpp +++ b/models/bpl1d.hpp @@ -1,5 +1,6 @@ #ifndef BROKEN_POWER_LAW_MODEL_H_ #define BROKEN_POWER_LAW_MODEL_H_ +#define OPT_HEADER #include <core/fitter.hpp> #include <cmath> diff --git a/models/bremss.hpp b/models/bremss.hpp index af48519..147e724 100644 --- a/models/bremss.hpp +++ b/models/bremss.hpp @@ -1,5 +1,6 @@ #ifndef BREMSS_MODEL_H_ #define BREMSS_MODEL_H_ +#define OPT_HEADER #include <core/fitter.hpp> #include <cmath> diff --git a/models/constant.hpp b/models/constant.hpp index f052756..666051f 100644 --- a/models/constant.hpp +++ b/models/constant.hpp @@ -1,5 +1,6 @@ #ifndef CONSTANT_MODEL_H_ #define CONSTANT_MODEL_H_ +#define OPT_HEADER #include <core/fitter.hpp> #include <cmath> diff --git a/models/dbeta1d.hpp b/models/dbeta1d.hpp index 44f6060..3ecd5b1 100644 --- a/models/dbeta1d.hpp +++ b/models/dbeta1d.hpp @@ -1,5 +1,6 @@ #ifndef DBETA_MODEL_H_ #define DBETA_MODEL_H_ +#define OPT_HEADER #include <core/fitter.hpp> #include <cmath> #include <iostream> diff --git a/models/dbeta2d.hpp b/models/dbeta2d.hpp index 473dd19..89003c9 100644 --- a/models/dbeta2d.hpp +++ b/models/dbeta2d.hpp @@ -1,5 +1,6 @@ #ifndef DBETA_MODEL2d_H_ #define DBETA_MODEL2d_H_ +#define OPT_HEADER #include <core/fitter.hpp> #include <cmath> #include <cassert> diff --git a/models/dbeta2d2.hpp b/models/dbeta2d2.hpp index 7c9adbc..e1ee307 100644 --- a/models/dbeta2d2.hpp +++ b/models/dbeta2d2.hpp @@ -1,5 +1,6 @@ #ifndef DDBETA_OOOMODEL2d2_H_ #define DDBETA_OOOMODEL2d2_H_ +#define OPT_HEADER #include <core/fitter.hpp> #include <cmath> #include <cassert> diff --git a/models/dbeta2d3.hpp b/models/dbeta2d3.hpp index 8db6efb..38052ec 100644 --- a/models/dbeta2d3.hpp +++ b/models/dbeta2d3.hpp @@ -1,5 +1,6 @@ #ifndef DDBETA3_MODEL2d2_H_ #define DDBETA3_MODEL2d2_H_ +#define OPT_HEADER #include <core/fitter.hpp> #include <cmath> #include <cassert> diff --git a/models/dl_model.hpp b/models/dl_model.hpp index 9188736..92a9820 100644 --- a/models/dl_model.hpp +++ b/models/dl_model.hpp @@ -1,7 +1,8 @@ #ifdef __linux__ -#ifndef DL_MODEL_H_ -#define DL_MODEL_H_ +#ifndef DL_MODEL_HPP +#define DL_MODEL_HPP +#define OPT_HEADER #include <core/fitter.hpp> #include <cmath> #include <iostream> diff --git a/models/func_model.hpp b/models/func_model.hpp index b47043a..2234cc1 100644 --- a/models/func_model.hpp +++ b/models/func_model.hpp @@ -1,5 +1,6 @@ #ifndef FUNC_MODEL_H_ #define FUNC_MODEL_H_ +#define OPT_HEADER #include <core/fitter.hpp> #include <cmath> #include <iostream> diff --git a/models/gauss1d.hpp b/models/gauss1d.hpp index 8221178..a31ace1 100644 --- a/models/gauss1d.hpp +++ b/models/gauss1d.hpp @@ -1,5 +1,6 @@ #ifndef GAUSS_MODEL_H_ #define GAUSS_MODEL_H_ +#define OPT_HEADER #include <core/fitter.hpp> #include <cmath> diff --git a/models/lin1d.hpp b/models/lin1d.hpp index 1a07424..0f6ac98 100644 --- a/models/lin1d.hpp +++ b/models/lin1d.hpp @@ -1,5 +1,6 @@ #ifndef LINEAR_MODEL_H_ #define LINEAR_MODEL_H_ +#define OPT_HEADER #include <core/fitter.hpp> #include <cmath> diff --git a/models/models.hpp b/models/models.hpp index 79201e8..3b78fc2 100644 --- a/models/models.hpp +++ b/models/models.hpp @@ -1,6 +1,6 @@ #ifndef MODELS_HPP #define MODELS_HPP - +#define OPT_HEADER #include <core/fitter.hpp> #include <map> #include <string> diff --git a/models/mul_model.hpp b/models/mul_model.hpp index d7cfbe2..9c9da8e 100644 --- a/models/mul_model.hpp +++ b/models/mul_model.hpp @@ -1,5 +1,6 @@ -#ifndef MUL_MODEL_H_ -#define MUL_MODEL_H_ +#ifndef MUL_MODEL_HPP +#define MUL_MODEL_HPP +#define OPT_HEADER #include <core/fitter.hpp> #include <cmath> diff --git a/models/nbeta1d.hpp b/models/nbeta1d.hpp index 83f43a3..ad00201 100644 --- a/models/nbeta1d.hpp +++ b/models/nbeta1d.hpp @@ -1,5 +1,6 @@ #ifndef NBETA_MODEL_H_ #define NBETA_MODEL_H_ +#define OPT_HEADER #include <core/fitter.hpp> #include <cmath> #include <iostream> diff --git a/models/nfw1d.hpp b/models/nfw1d.hpp index 6ce9df0..4dc1970 100644 --- a/models/nfw1d.hpp +++ b/models/nfw1d.hpp @@ -1,5 +1,6 @@ #ifndef NFW_MODEL_H_ #define NFW_MODEL_H_ +#define OPT_HEADER #include <core/fitter.hpp> #include <cmath> #include <iostream> diff --git a/models/pl1d.hpp b/models/pl1d.hpp index 3b52832..c048334 100644 --- a/models/pl1d.hpp +++ b/models/pl1d.hpp @@ -1,5 +1,6 @@ #ifndef POWER_LAW_MODEL_H_ #define POWER_LAW_MODEL_H_ +#define OPT_HEADER #include <core/fitter.hpp> #include <cmath> diff --git a/models/poly1d.hpp b/models/poly1d.hpp index 457ce3a..142f6ba 100644 --- a/models/poly1d.hpp +++ b/models/poly1d.hpp @@ -1,5 +1,6 @@ #ifndef POLY_MODEL_H_ #define POLY_MODEL_H_ +#define OPT_HEADER #include <core/fitter.hpp> #include <cmath> #include <sstream> diff --git a/models/pow_model.hpp b/models/pow_model.hpp index 3e1ea17..6702236 100644 --- a/models/pow_model.hpp +++ b/models/pow_model.hpp @@ -1,5 +1,6 @@ #ifndef POW_MODEL_H_ #define POW_MODEL_H_ +#define OPT_HEADER #include <core/fitter.hpp> #include <core/opt_traits.hpp> #include <cmath> diff --git a/models/strmodel1d.hpp b/models/strmodel1d.hpp index af74453..4cb1786 100644 --- a/models/strmodel1d.hpp +++ b/models/strmodel1d.hpp @@ -1,5 +1,6 @@ #ifndef STRMODEL1D_HPP #define STRMODEL1D_HPP +#define OPT_HEADER #include <core/fitter.hpp> #include <cmath> #include <sstream> diff --git a/models/vecn.hpp b/models/vecn.hpp index 8b65361..b37ff11 100644 --- a/models/vecn.hpp +++ b/models/vecn.hpp @@ -1,5 +1,6 @@ #ifndef VECN_HPP #define VECN_HPP +#define OPT_HEADER #include <iostream> namespace opt_utilities { diff --git a/statistics/chisq.hpp b/statistics/chisq.hpp index 3dff92d..acc9e66 100644 --- a/statistics/chisq.hpp +++ b/statistics/chisq.hpp @@ -4,6 +4,7 @@ #ifndef CHI_SQ_HPP
#define CHI_SQ_HPP
+#define OPT_HEADER
#include <core/fitter.hpp>
#include <iostream>
#include <vector>
diff --git a/statistics/cstat.hpp b/statistics/cstat.hpp index ef1fa12..ba4c3ab 100644 --- a/statistics/cstat.hpp +++ b/statistics/cstat.hpp @@ -4,6 +4,7 @@ #ifndef CSTAT_HPP
#define CSTAT_HPP
+#define OPT_HEADER
#include <core/fitter.hpp>
#include <iostream>
diff --git a/statistics/leastsq.hpp b/statistics/leastsq.hpp index 146a069..abaaf1c 100644 --- a/statistics/leastsq.hpp +++ b/statistics/leastsq.hpp @@ -3,7 +3,8 @@ */
#ifndef LEAST_SQ_HPP
-#define LeAST_SQ_HPP
+#define LEAST_SQ_HPP
+#define OPT_HEADER
#include <core/fitter.hpp>
#include <iostream>
#include <vector>
diff --git a/utilities/opt_types.hpp b/utilities/opt_types.hpp index fd76169..2f275f5 100644 --- a/utilities/opt_types.hpp +++ b/utilities/opt_types.hpp @@ -1,5 +1,6 @@ #ifndef OPT_TYPES_HPP #define OPT_TYPES_HPP +#define OPT_HEADER #include <core/optimizer.hpp> #include <core/fitter.hpp> #include <data_sets/default_data_set.hpp> |