Commit 7e6bd80f authored by Houtan Bastani's avatar Houtan Bastani
Browse files

estimation: remove s from parameters substructure

parent 31e0bc2e
......@@ -252,10 +252,10 @@ estimation_info.empty_prior = struct(...
estimation_info.empty_options = struct(...
'bounds',{}, 'init', {}, 'jscale', {});
estimation_info.subsamples.range = struct('date1', {}, 'date2', {});
estimation_info.parameters.prior = estimation_info.empty_prior;
estimation_info.parameters.subsample_prior = estimation_info.empty_prior;
estimation_info.parameters.options = estimation_info.empty_options;
estimation_info.parameters.subsample_options = estimation_info.empty_options;
estimation_info.parameter.prior = estimation_info.empty_prior;
estimation_info.parameter.subsample_prior = estimation_info.empty_prior;
estimation_info.parameter.options = estimation_info.empty_options;
estimation_info.parameter.subsample_options = estimation_info.empty_options;
estimation_info.structural_innovation.prior = estimation_info.empty_prior;
estimation_info.structural_innovation.subsample_prior = estimation_info.empty_prior;
estimation_info.structural_innovation.options = estimation_info.empty_options;
......@@ -276,7 +276,7 @@ estimation_info.subsamples_index = {};
estimation_info.subsamples.range_index = {};
estimation_info.parameter_prior_index = {};
estimation_info.parameter_options_index = {};
estimation_info.parameters.range_index = {};
estimation_info.parameter.range_index = {};
estimation_info.measurement_error_prior_index = {};
estimation_info.measurement_error_options_index = {};
estimation_info.measurement_error.range_index = {};
......
......@@ -1819,7 +1819,7 @@ PriorStatement::PriorStatement(const string &name_arg,
void
PriorStatement::writeOutput(ostream &output, const string &basename) const
{
string lhs_field = "estimation_info.parameters(eifind)";
string lhs_field = "estimation_info.parameter(eifind)";
output << "eifind = get_new_or_existing_ei_index('parameter_prior_index', '"
<< name << "', '');" << endl
<< "estimation_info.parameter_prior_index(eifind) = {'" << name << "'};" << endl;
......@@ -1964,10 +1964,10 @@ PriorEqualStatement::writeOutput(ostream &output, const string &basename) const
output << "'};" << endl;
if (to_declaration_type == "par")
lhs_field = "parameters";
lhs_field = "parameter";
if (from_declaration_type == "par")
rhs_field = "parameters";
rhs_field = "parameter";
lhs_field = "estimation_info." + lhs_field + "(ei_to_ind)";
rhs_field = "estimation_info." + rhs_field + "(ei_from_ind)";
......@@ -2066,7 +2066,7 @@ OptionsStatement::OptionsStatement(const string &name_arg,
void
OptionsStatement::writeOutput(ostream &output, const string &basename) const
{
string lhs_field = "estimation_info.parameters(eifind)";
string lhs_field = "estimation_info.parameter(eifind)";
output << "eifind = get_new_or_existing_ei_index('parameter_options_index', '"
<< name << "', '');" << endl
<< "estimation_info.parameter_options_index(eifind) = {'" << name << "'};" << endl;
......@@ -2206,10 +2206,10 @@ OptionsEqualStatement::writeOutput(ostream &output, const string &basename) cons
output << "'};" << endl;
if (to_declaration_type == "par")
lhs_field = "parameters";
lhs_field = "parameter";
if (from_declaration_type == "par")
rhs_field = "parameters";
rhs_field = "parameter";
lhs_field = "estimation_info." + lhs_field + "(ei_to_ind)";
rhs_field = "estimation_info." + rhs_field + "(ei_from_ind)";
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment