diff options
| -rw-r--r-- | core/fitter.hpp | 74 | ||||
| -rw-r--r-- | core/opt_exception.hpp | 28 | ||||
| -rw-r--r-- | core/optimizer.hpp | 30 | ||||
| -rw-r--r-- | error_estimator/error_estimator.hpp | 4 | ||||
| -rw-r--r-- | misc/bootstrap.hpp | 6 |
5 files changed, 71 insertions, 71 deletions
diff --git a/core/fitter.hpp b/core/fitter.hpp index 5ec85c5..b9d3995 100644 --- a/core/fitter.hpp +++ b/core/fitter.hpp @@ -659,7 +659,7 @@ namespace opt_utilities {
if(p_param_modifier==0)
{
- throw param_modifier_undefined();
+ throw param_modifier_not_defined();
}
return *p_param_modifier;
}
@@ -671,7 +671,7 @@ namespace opt_utilities {
if(p_param_modifier==0)
{
- throw param_modifier_undefined();
+ throw param_modifier_not_defined();
}
return *p_param_modifier;
}
@@ -1167,7 +1167,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
return p_model->eval(x,p);
}
@@ -1183,7 +1183,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
return p_model->eval_raw(x,p);
}
@@ -1196,7 +1196,7 @@ namespace opt_utilities {
if(p_data_set==0)
{
- throw data_unloaded();
+ throw data_not_loaded();
}
return *(this->p_data_set);
}
@@ -1210,7 +1210,7 @@ namespace opt_utilities {
if(p_data_set==0)
{
- throw data_unloaded();
+ throw data_not_loaded();
}
return *(this->p_data_set);
}
@@ -1223,7 +1223,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
return *(this->p_model);
}
@@ -1236,7 +1236,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
return *(this->p_model);
}
@@ -1249,7 +1249,7 @@ namespace opt_utilities {
if(p_statistic==0)
{
- throw statistic_undefined();
+ throw statistic_not_defined();
}
return *(this->p_statistic);
}
@@ -1262,7 +1262,7 @@ namespace opt_utilities {
if(p_statistic==0)
{
- throw statistic_undefined();
+ throw statistic_not_defined();
}
return *(this->p_statistic);
}
@@ -1303,7 +1303,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
return p_model->get_param_modifier();
}
@@ -1316,7 +1316,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
return p_model->get_param_modifier();
}
@@ -1330,7 +1330,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
return p_model->report_param_status(s);
}
@@ -1346,7 +1346,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
return p_model->get_param_info(pname).get_value();
}
@@ -1360,7 +1360,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
return p_model->get_param_info(pname).get_lower_limit();
}
@@ -1374,7 +1374,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
return p_model->get_param_info(pname).get_upper_limit();
}
@@ -1388,7 +1388,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
return p_model->get_param_info(pname);
}
@@ -1402,7 +1402,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
return p_model->get_param_info(n);
}
@@ -1416,7 +1416,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
return p_model->get_param_order(pname);
}
@@ -1429,7 +1429,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
return p_model->get_num_params();
}
@@ -1442,7 +1442,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
//return current_param;
return p_model->get_all_params();
@@ -1492,7 +1492,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
p_model->set_param_modifier(pm);
}
@@ -1504,7 +1504,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
p_model->clear_param_modifier();
}
@@ -1547,7 +1547,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
p_model->set_param_value(pname,v);
}
@@ -1562,7 +1562,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
p_model->set_param_lower_limit(pname,v);
}
@@ -1577,7 +1577,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
p_model->set_param_upper_limit(pname,v);
}
@@ -1592,7 +1592,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
p_model->set_param_value(param);
}
@@ -1605,7 +1605,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
p_model->set_param_lower_limit(param);
}
@@ -1618,7 +1618,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
p_model->set_param_upper_limit(param);
}
@@ -1633,7 +1633,7 @@ namespace opt_utilities {
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
p_model->set_param_info(pinfo);
}
@@ -1668,18 +1668,18 @@ namespace opt_utilities // assert(p_model!=0);
if(p_model==0)
{
- throw model_undefined();
+ throw model_not_defined();
}
if(p_data_set==0)
{
- throw data_unloaded();
+ throw data_not_loaded();
}
//assert(p_optimizer!=0);
//assert(p_data_set!=0);
//assert(p_statistic!=0);
if(p_statistic==0)
{
- throw statistic_undefined();
+ throw statistic_not_defined();
}
optengine.set_func_obj(*p_statistic);
@@ -1852,7 +1852,7 @@ namespace opt_utilities {
if(p_fitter==0)
{
- throw fitter_unset();
+ throw fitter_not_set();
}
return *p_fitter;
}
@@ -1867,7 +1867,7 @@ namespace opt_utilities {
if(p_fitter==0)
{
- throw fitter_unset();
+ throw fitter_not_set();
}
return p_fitter->eval_model(x,p);
}
@@ -1880,7 +1880,7 @@ namespace opt_utilities {
if(p_fitter==0)
{
- throw fitter_unset();
+ throw fitter_not_set();
}
return p_fitter->get_data_set();
}
@@ -2030,7 +2030,7 @@ namespace opt_utilities if(p_model==0)
{
std::cout<<"dajf;asdjfk;";
- throw model_undefined();
+ throw model_not_defined();
}
return *(this->p_model);
}
diff --git a/core/opt_exception.hpp b/core/opt_exception.hpp index 37ec863..72528f6 100644 --- a/core/opt_exception.hpp +++ b/core/opt_exception.hpp @@ -40,11 +40,11 @@ namespace opt_utilities When objection is not defined in optimizer, and optimizion is performing, this exception will be thrown */ - class object_function_undefined + class object_function_not_defined :public opt_exception { public: - object_function_undefined() + object_function_not_defined() :opt_exception("object function undefined") {} }; @@ -53,11 +53,11 @@ namespace opt_utilities When the opt_method is not defined before the optimization is performing, this exception will be thrown. */ - class opt_method_undefined + class opt_method_not_defined :public opt_exception { public: - opt_method_undefined() + opt_method_not_defined() :opt_exception("opt method undefined") {} }; @@ -66,11 +66,11 @@ namespace opt_utilities When fitter is not attached in a model, statistic, and other objects, this exception will be thrown. */ - class fitter_unset + class fitter_not_set :public opt_exception { public: - fitter_unset() + fitter_not_set() :opt_exception("fitter_unset") {} }; @@ -80,11 +80,11 @@ namespace opt_utilities When the model is not set before the model fitting, this exception will be thrown. */ - class model_undefined + class model_not_defined :public opt_exception { public: - model_undefined() + model_not_defined() :opt_exception("model_undefined") {} }; @@ -94,11 +94,11 @@ namespace opt_utilities When the data set is not loaded before the model fitting, this exception will be thrown. */ - class data_unloaded + class data_not_loaded :public opt_exception { public: - data_unloaded() + data_not_loaded() :opt_exception("data not loaded") {} }; @@ -108,11 +108,11 @@ namespace opt_utilities When the statistic is not set before the model fitting, this exception will be thrown. */ - class statistic_undefined + class statistic_not_defined :public opt_exception { public: - statistic_undefined() + statistic_not_defined() :opt_exception("statistic undefined") {} }; @@ -136,11 +136,11 @@ namespace opt_utilities If param_modifier is not defined, and the user tries to get the param_modifer, this exception will be thrown. */ - class param_modifier_undefined + class param_modifier_not_defined :public opt_exception { public: - param_modifier_undefined() + param_modifier_not_defined() :opt_exception("param modifier undefined") {} }; diff --git a/core/optimizer.hpp b/core/optimizer.hpp index cd78d3d..63e4edd 100644 --- a/core/optimizer.hpp +++ b/core/optimizer.hpp @@ -477,7 +477,7 @@ namespace opt_utilities { if(p_opt_method==0) { - throw opt_method_undefined(); + throw opt_method_not_defined(); } return *(this->p_opt_method); } @@ -490,7 +490,7 @@ namespace opt_utilities { if(p_opt_method==0) { - throw opt_method_undefined(); + throw opt_method_not_defined(); } return *(this->p_opt_method); } @@ -504,7 +504,7 @@ namespace opt_utilities { if(p_opt_method==0) { - throw opt_method_undefined(); + throw opt_method_not_defined(); } p_opt_method->set_precision(x); } @@ -517,7 +517,7 @@ namespace opt_utilities { if(p_opt_method==0) { - throw opt_method_undefined(); + throw opt_method_not_defined(); } return p_opt_method->get_precision(); } @@ -531,7 +531,7 @@ namespace opt_utilities { if(p_opt_method==0) { - throw opt_method_undefined(); + throw opt_method_not_defined(); } p_opt_method->set_start_point(x); } @@ -544,7 +544,7 @@ namespace opt_utilities { if(p_opt_method==0) { - throw opt_method_undefined(); + throw opt_method_not_defined(); } return p_opt_method->get_start_point(); } @@ -558,7 +558,7 @@ namespace opt_utilities { if(p_opt_method==0) { - throw opt_method_undefined(); + throw opt_method_not_defined(); } p_opt_method->set_lower_limit(x); } @@ -571,7 +571,7 @@ namespace opt_utilities { if(p_opt_method==0) { - throw opt_method_undefined(); + throw opt_method_not_defined(); } return p_opt_method->get_lower_limit(); } @@ -585,7 +585,7 @@ namespace opt_utilities { if(p_opt_method==0) { - throw opt_method_undefined(); + throw opt_method_not_defined(); } p_opt_method->set_upper_limit(x); } @@ -598,7 +598,7 @@ namespace opt_utilities { if(p_opt_method==0) { - throw opt_method_undefined(); + throw opt_method_not_defined(); } return p_opt_method->get_upper_limit(); } @@ -613,7 +613,7 @@ namespace opt_utilities { if(p_func_obj==0) { - throw object_function_undefined(); + throw object_function_not_defined(); } return p_func_obj->eval(x); } @@ -628,11 +628,11 @@ namespace opt_utilities { if(p_opt_method==0) { - throw opt_method_undefined(); + throw opt_method_not_defined(); } if(p_func_obj==0) { - throw object_function_undefined(); + throw object_function_not_defined(); } return p_opt_method->optimize(); } @@ -665,7 +665,7 @@ namespace opt_utilities { if(p_func_obj==0) { - throw object_function_undefined(); + throw object_function_not_defined(); } return *p_func_obj; } @@ -677,7 +677,7 @@ namespace opt_utilities { if(p_func_obj==0) { - throw object_function_undefined(); + throw object_function_not_defined(); } return *p_func_obj; } diff --git a/error_estimator/error_estimator.hpp b/error_estimator/error_estimator.hpp index e7a0cc0..8fc8439 100644 --- a/error_estimator/error_estimator.hpp +++ b/error_estimator/error_estimator.hpp @@ -25,7 +25,7 @@ namespace opt_utilities { h.reset(fit.get_param_modifier().clone()); } - catch(const param_modifier_undefined&) + catch(const param_modifier_not_defined&) { h.reset(0); } @@ -78,7 +78,7 @@ namespace opt_utilities } *pfp+=freeze_param<Ty,Tx,Tp,Tstr>(pname); } - catch(const param_modifier_undefined&) + catch(const param_modifier_not_defined&) { fit.set_param_modifier(freeze_param<Ty,Tx,Tp,Tstr>(pname)); } diff --git a/misc/bootstrap.hpp b/misc/bootstrap.hpp index 3c9feb4..6059917 100644 --- a/misc/bootstrap.hpp +++ b/misc/bootstrap.hpp @@ -119,7 +119,7 @@ namespace opt_utilities } else { - throw opt_exception("Fitter unset"); + throw opt_exception("Fitter not_set"); } } @@ -173,7 +173,7 @@ namespace opt_utilities { if(p_fitter==NULL) { - throw fitter_unset(); + throw fitter_not_set(); } current_data_set=default_data_set<Ty,Tx>(); for(size_t i=0;i<origin_data_set.size();++i) @@ -207,7 +207,7 @@ namespace opt_utilities { if(p_fitter==NULL) { - throw opt_exception("Fitter unset"); + throw opt_exception("Fitter not_set"); } if(param_pool.empty()) { |