From 7e6bd80f1721ac53815c92b8537f24d089a3c6a1 Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Mon, 2 Apr 2012 17:03:43 +0200 Subject: [PATCH] estimation: remove s from parameters substructure --- matlab/global_initialization.m | 10 +++++----- preprocessor/ComputingTasks.cc | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/matlab/global_initialization.m b/matlab/global_initialization.m index 46dc67597..bfb969ffb 100644 --- a/matlab/global_initialization.m +++ b/matlab/global_initialization.m @@ -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 = {}; diff --git a/preprocessor/ComputingTasks.cc b/preprocessor/ComputingTasks.cc index 83fc079cd..9ede60828 100644 --- a/preprocessor/ComputingTasks.cc +++ b/preprocessor/ComputingTasks.cc @@ -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)";