diff --git a/fityk/fityk.cpp b/fityk/fityk.cpp index 7b28768f..b4b5f807 100644 --- a/fityk/fityk.cpp +++ b/fityk/fityk.cpp @@ -129,8 +129,7 @@ Fityk::~Fityk() delete p_; } -void Fityk::execute(string const& s) throw(SyntaxError, ExecuteError, - ExitRequestedException) +void Fityk::execute(string const& s) { try { priv_->parse_and_execute_line(s); @@ -139,8 +138,7 @@ void Fityk::execute(string const& s) throw(SyntaxError, ExecuteError, CATCH_EXECUTE_ERROR } -string Fityk::get_info(string const& s, int dataset) throw(SyntaxError, - ExecuteError) +string Fityk::get_info(string const& s, int dataset) { try { string result; @@ -152,8 +150,7 @@ string Fityk::get_info(string const& s, int dataset) throw(SyntaxError, return ""; } -realt Fityk::calculate_expr(string const& s, int dataset) throw(SyntaxError, - ExecuteError) +realt Fityk::calculate_expr(string const& s, int dataset) { try { Lexer lex(s.c_str()); @@ -209,7 +206,7 @@ const Func* Fityk::get_function(const std::string& name) const return priv_->mgr.functions()[n]; } -vector Fityk::get_components(int dataset, char fz) throw(ExecuteError) +vector Fityk::get_components(int dataset, char fz) { const Model *model = priv_->dk.get_model(hd(priv_, dataset)); const vector& indexes = model->get_fz(fz).idx; @@ -220,7 +217,7 @@ vector Fityk::get_components(int dataset, char fz) throw(ExecuteError) return ret; } -realt Fityk::get_model_value(realt x, int dataset) const throw(ExecuteError) +realt Fityk::get_model_value(realt x, int dataset) const { try { return priv_->dk.get_model(hd(priv_, dataset))->value(x); @@ -230,7 +227,6 @@ realt Fityk::get_model_value(realt x, int dataset) const throw(ExecuteError) } vector Fityk::get_model_vector(vector const& x, int dataset) - throw(ExecuteError) { vector xx(x); vector yy(x.size(), 0.); @@ -241,7 +237,7 @@ vector Fityk::get_model_vector(vector const& x, int dataset) return yy; } -const Var* Fityk::get_variable(string const& name) const throw(ExecuteError) +const Var* Fityk::get_variable(string const& name) const { try { string vname; @@ -274,7 +270,6 @@ double Fityk::get_view_boundary(char side) } void Fityk::load(LoadSpec const& spec, int dataset) - throw(ExecuteError) { if (dataset == DEFAULT_DATASET) dataset = priv_->dk.default_idx(); @@ -290,7 +285,7 @@ void Fityk::load_data(int dataset, vector const& x, vector const& y, vector const& sigma, - string const& title) throw(ExecuteError) + string const& title) { try { priv_->dk.data(dataset)->load_arrays(x, y, sigma, title); @@ -299,7 +294,6 @@ void Fityk::load_data(int dataset, } void Fityk::add_point(realt x, realt y, realt sigma, int dataset) - throw(ExecuteError) { try { priv_->dk.data(hd(priv_, dataset))->add_one_point(x, y, sigma); @@ -307,7 +301,7 @@ void Fityk::add_point(realt x, realt y, realt sigma, int dataset) CATCH_EXECUTE_ERROR } -vector const& Fityk::get_data(int dataset) throw(ExecuteError) +vector const& Fityk::get_data(int dataset) { static const vector empty; try { @@ -335,23 +329,21 @@ void Fityk::redir_messages(FILE *stream) } void Fityk::set_option_as_string(const string& opt, const string& val) - throw(ExecuteError) { priv_->mutable_settings_mgr()->set_as_string(opt, val); } void Fityk::set_option_as_number(const string& opt, double val) - throw(ExecuteError) { priv_->mutable_settings_mgr()->set_as_number(opt, val); } -string Fityk::get_option_as_string(const string& opt) const throw(ExecuteError) +string Fityk::get_option_as_string(const string& opt) const { return priv_->settings_mgr()->get_as_string(opt, /*quote_str=*/false); } -double Fityk::get_option_as_number(const string& opt) const throw(ExecuteError) +double Fityk::get_option_as_number(const string& opt) const { return priv_->settings_mgr()->get_as_number(opt); } @@ -366,7 +358,7 @@ string Fityk::input(string const& prompt) return priv_->ui()->get_input_from_user(prompt); } -realt Fityk::get_wssr(int dataset) throw(ExecuteError) +realt Fityk::get_wssr(int dataset) { try { return get_wssr_or_ssr(priv_, dataset, true); @@ -375,7 +367,7 @@ realt Fityk::get_wssr(int dataset) throw(ExecuteError) return 0.; } -realt Fityk::get_ssr(int dataset) throw(ExecuteError) +realt Fityk::get_ssr(int dataset) { try { return get_wssr_or_ssr(priv_, dataset, false); @@ -384,7 +376,7 @@ realt Fityk::get_ssr(int dataset) throw(ExecuteError) return 0.; } -realt Fityk::get_rsquared(int dataset) throw(ExecuteError) +realt Fityk::get_rsquared(int dataset) { try { if (dataset == ALL_DATASETS) { @@ -402,7 +394,7 @@ realt Fityk::get_rsquared(int dataset) throw(ExecuteError) return 0.; } -int Fityk::get_dof(int dataset) throw(ExecuteError) +int Fityk::get_dof(int dataset) { try { return priv_->get_fit()->get_dof(get_datasets_(priv_, dataset)); @@ -412,7 +404,6 @@ int Fityk::get_dof(int dataset) throw(ExecuteError) } vector > Fityk::get_covariance_matrix(int dataset) - throw(ExecuteError) { try { vector dss = get_datasets_(priv_, dataset); diff --git a/fityk/fityk.h b/fityk/fityk.h index deb7d5a6..0ab7ce74 100644 --- a/fityk/fityk.h +++ b/fityk/fityk.h @@ -120,10 +120,8 @@ class FITYK_API Func virtual const std::string& get_template_name() const = 0; virtual std::string get_param(int n) const = 0; - virtual const std::string& var_name(const std::string& param) const - throw(ExecuteError) = 0; - virtual realt get_param_value(const std::string& param) const - throw(ExecuteError) = 0; + virtual const std::string& var_name(const std::string& param) const = 0; + virtual realt get_param_value(const std::string& param) const = 0; virtual realt value_at(realt x) const = 0; protected: Func(const std::string name_) : name(name_) {} @@ -179,26 +177,23 @@ class FITYK_API Fityk // @{ /// execute command; throws exception on error - void execute(std::string const& s) throw(SyntaxError, ExecuteError, - ExitRequestedException); + void execute(std::string const& s); /// load data from file (path should be ascii or utf8, col=0 is index) - void load(LoadSpec const& spec, int dataset=DEFAULT_DATASET) - throw(ExecuteError); + void load(LoadSpec const& spec, int dataset=DEFAULT_DATASET); void load(std::string const& path, int dataset=DEFAULT_DATASET) - throw(ExecuteError) { load(LoadSpec(path), dataset); } + { load(LoadSpec(path), dataset); } /// load data from arrays void load_data(int dataset, std::vector const& x, std::vector const& y, std::vector const& sigma, - std::string const& title="") throw(ExecuteError); + std::string const& title=""); /// add one data point to dataset - void add_point(realt x, realt y, realt sigma, int dataset=DEFAULT_DATASET) - throw(ExecuteError); + void add_point(realt x, realt y, realt sigma, int dataset=DEFAULT_DATASET); // @} @@ -222,14 +217,10 @@ class FITYK_API Fityk /// @name settings // @{ - void set_option_as_string(const std::string& opt, const std::string& val) - throw(ExecuteError); - void set_option_as_number(const std::string& opt, double val) - throw(ExecuteError); - std::string get_option_as_string(const std::string& opt) const - throw(ExecuteError); - double get_option_as_number(const std::string& opt) const - throw(ExecuteError); + void set_option_as_string(const std::string& opt, const std::string& val); + void set_option_as_number(const std::string& opt, double val); + std::string get_option_as_string(const std::string& opt) const; + double get_option_as_number(const std::string& opt) const; // @} /// @name input/output @@ -255,12 +246,10 @@ class FITYK_API Fityk // @{ /// return output of the info command - std::string get_info(std::string const& s, int dataset=DEFAULT_DATASET) - throw(SyntaxError, ExecuteError); + std::string get_info(std::string const& s, int dataset=DEFAULT_DATASET); /// return expression value, similarly to the print command - realt calculate_expr(std::string const& s, int dataset=DEFAULT_DATASET) - throw(SyntaxError, ExecuteError); + realt calculate_expr(std::string const& s, int dataset=DEFAULT_DATASET); //(planned) /// returns dataset titles @@ -275,8 +264,7 @@ class FITYK_API Fityk int get_default_dataset() const; /// get data points - std::vector const& get_data(int dataset=DEFAULT_DATASET) - throw(ExecuteError); + std::vector const& get_data(int dataset=DEFAULT_DATASET); /// returns number of simple-variables (parameters that can be fitted) int get_parameter_count() const; @@ -288,7 +276,7 @@ class FITYK_API Fityk std::vector all_variables() const; /// returns variable $name - const Var* get_variable(std::string const& name) const throw(ExecuteError); + const Var* get_variable(std::string const& name) const; /// returns all %functions std::vector all_functions() const; @@ -297,17 +285,14 @@ class FITYK_API Fityk const Func* get_function(const std::string& name) const; /// returns %functions used in dataset - std::vector get_components(int dataset=DEFAULT_DATASET, char fz='F') - throw(ExecuteError); + std::vector get_components(int dataset=DEFAULT_DATASET, char fz='F'); /// returns the value of the model for a given dataset at x - realt get_model_value(realt x, int dataset=DEFAULT_DATASET) const - throw(ExecuteError); + realt get_model_value(realt x, int dataset=DEFAULT_DATASET) const; /// multiple point version of the get_model_value() std::vector - get_model_vector(std::vector const& x, int dataset=DEFAULT_DATASET) - throw(ExecuteError); + get_model_vector(std::vector const& x, int dataset=DEFAULT_DATASET); /// get coordinates of rectangle set by the plot command /// side is one of L(eft), R(ight), T(op), B(ottom) @@ -319,20 +304,20 @@ class FITYK_API Fityk // @{ /// get WSSR for given dataset or for all datasets - realt get_wssr(int dataset=ALL_DATASETS) throw(ExecuteError); + realt get_wssr(int dataset=ALL_DATASETS); /// get SSR for given dataset or for all datasets - realt get_ssr(int dataset=ALL_DATASETS) throw(ExecuteError); + realt get_ssr(int dataset=ALL_DATASETS); /// get R-squared for given dataset or for all datasets - realt get_rsquared(int dataset=ALL_DATASETS) throw(ExecuteError); + realt get_rsquared(int dataset=ALL_DATASETS); /// get number of degrees-of-freedom for given dataset or for all datasets - int get_dof(int dataset=ALL_DATASETS) throw(ExecuteError); + int get_dof(int dataset=ALL_DATASETS); /// get covariance matrix (for given dataset or for all datasets) std::vector > - get_covariance_matrix(int dataset=ALL_DATASETS) throw(ExecuteError); + get_covariance_matrix(int dataset=ALL_DATASETS); // @} /// UiApi contains functions used by CLI and may be used to implement diff --git a/fityk/func.cpp b/fityk/func.cpp index 1813374e..86c8338d 100644 --- a/fityk/func.cpp +++ b/fityk/func.cpp @@ -197,7 +197,7 @@ int Function::get_param_nr(const string& param) const return n; } -realt Function::get_param_value(const string& param) const throw(ExecuteError) +realt Function::get_param_value(const string& param) const { realt a; if (!param.empty() && islower(param[0])) diff --git a/fityk/func.h b/fityk/func.h index 8cbf5f9b..3bb79a9a 100644 --- a/fityk/func.h +++ b/fityk/func.h @@ -89,8 +89,7 @@ class FITYK_API Function : public Func #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated" #endif - virtual realt get_param_value(const std::string& param) const - throw(ExecuteError); // exc. spec. is used by SWIG + virtual realt get_param_value(const std::string& param) const; realt numarea(realt x1, realt x2, int nsteps) const; @@ -104,7 +103,6 @@ class FITYK_API Function : public Func // implementation of members of Func virtual const std::string& get_template_name() const { return tp_->name; } virtual const std::string& var_name(const std::string& param) const - throw(ExecuteError) // exc. spec. is used by SWIG { return used_vars_.get_name(get_param_nr(param)); } #if defined(__clang__) #pragma clang diagnostic pop