From ec2528ae9b67d798a5b5b6795201c9ed434b54da Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtan.bastani@ens.fr>
Date: Fri, 9 Mar 2012 11:47:25 +0100
Subject: [PATCH] estimation: fixes to options statement
---
matlab/global_initialization.m | 2 ++
preprocessor/ComputingTasks.cc | 2 +-
preprocessor/ParsingDriver.cc | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/matlab/global_initialization.m b/matlab/global_initialization.m
index f9dac2fe6..6eaf33c47 100644
--- a/matlab/global_initialization.m
+++ b/matlab/global_initialization.m
@@ -252,10 +252,12 @@ estimation_info.measurement_error.prior = struct('name', {}, 'shape', {}, 'mean'
estimation_info.measurement_error_corr.prior = struct('name', {}, 'shape', {}, 'mean', {}, ...
'mode', {}, 'stdev', {}, 'date1', {}, ...
'date2', {}, 'shift', {}, 'variance', {});
+estimation_info.parameters.prior_index = {};
estimation_info.measurement_error.prior_index = {};
estimation_info.structural_innovation.prior_index = {};
estimation_info.measurement_error_corr.prior_index = {};
estimation_info.structural_innovation_corr.prior_index = {};
+estimation_info.parameters.options_index = {};
estimation_info.measurement_error.options_index = {};
estimation_info.structural_innovation.options_index = {};
estimation_info.measurement_error_corr.options_index = {};
diff --git a/preprocessor/ComputingTasks.cc b/preprocessor/ComputingTasks.cc
index 4a0ddcc67..39519eca0 100644
--- a/preprocessor/ComputingTasks.cc
+++ b/preprocessor/ComputingTasks.cc
@@ -1937,7 +1937,7 @@ OptionsStatement::checkPass(ModFileStructure &mod_file_struct, WarningConsolidat
void
OptionsStatement::writeOutput(ostream &output, const string &basename) const
{
- string lhs_field = ".options";
+ string lhs_field = ".parameters.options";
writeOptionsIndex(output, lhs_field);
output << "estimation_info" << lhs_field <<"_index(options_indx) = {'" << name << "'};" << endl
diff --git a/preprocessor/ParsingDriver.cc b/preprocessor/ParsingDriver.cc
index db60330e4..ef442d03d 100644
--- a/preprocessor/ParsingDriver.cc
+++ b/preprocessor/ParsingDriver.cc
@@ -1358,7 +1358,7 @@ void
ParsingDriver::set_std_options(string *name)
{
check_symbol_is_endogenous_or_exogenous(name);
- // mod_file->addStatement(new StdOptionsStatement(*name, options_list, mod_file->symbol_table));
+ mod_file->addStatement(new StdOptionsStatement(*name, options_list, mod_file->symbol_table));
options_list.clear();
delete name;
}
@@ -1382,7 +1382,7 @@ ParsingDriver::set_corr_options(string *name1, string *name2)
{
check_symbol_is_endogenous_or_exogenous(name1);
check_symbol_is_endogenous_or_exogenous(name2);
- // mod_file->addStatement(new CorrOptionsStatement(*name1, *name2, options_list, mod_file->symbol_table));
+ mod_file->addStatement(new CorrOptionsStatement(*name1, *name2, options_list, mod_file->symbol_table));
options_list.clear();
delete name1;
delete name2;
--
GitLab