Commit ec2528ae authored by Houtan Bastani's avatar Houtan Bastani
Browse files

estimation: fixes to options statement

parent dd67a81e
......@@ -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 = {};
......
......@@ -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
......
......@@ -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;
......
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