preprocessor: add parameter_set option to evaluate_smoother command. Closes #1477

issue#70
Houtan Bastani 2017-08-28 18:19:41 +02:00
parent 12ddf85690
commit b6176ae406
2 changed files with 5 additions and 1 deletions

View File

@ -4345,10 +4345,13 @@ void
CalibSmootherStatement::writeOutput(ostream &output, const string &basename, bool minimal_workspace) const
{
options_list.writeOutput(output);
OptionsList::string_options_t::const_iterator it = options_list.string_options.find("parameter_set");
if (it == options_list.string_options.end())
output << "options_.parameter_set = 'calibration';" << endl;
symbol_list.writeOutput("var_list_", output);
output << "options_.smoother = 1;" << endl
<< "options_.order = 1;" << endl
<< "[oo_, M_, options_, bayestopt_] = evaluate_smoother('calibration', var_list_, M_, oo_, options_, bayestopt_, estim_params_);" << endl;
<< "[oo_, M_, options_, bayestopt_] = evaluate_smoother(options_.parameter_set, var_list_, M_, oo_, options_, bayestopt_, estim_params_);" << endl;
}
void

View File

@ -2700,6 +2700,7 @@ calib_smoother_option : o_filtered_vars
| o_diffuse_kalman_tol
| o_diffuse_filter
| o_smoothed_state_uncertainty
| o_parameter_set
;
extended_path : EXTENDED_PATH ';'