Commit 01194422 authored by sebastien's avatar sebastien
Browse files

trunk:

* fixed displaying of subtitles when HP filter is present
* fail if HP filter required on empirical simulations (not yet implemented)


git-svn-id: https://www.dynare.org/svn/dynare/dynare_v4@2237 ac1d8469-bf42-47a9-8791-bf33cf982152
parent fef65c8c
...@@ -154,6 +154,14 @@ StochSimulStatement::checkPass(ModFileStructure &mod_file_struct) ...@@ -154,6 +154,14 @@ StochSimulStatement::checkPass(ModFileStructure &mod_file_struct)
OptionsList::num_options_type::const_iterator it = options_list.num_options.find("order"); OptionsList::num_options_type::const_iterator it = options_list.num_options.find("order");
if (it != options_list.num_options.end()) if (it != options_list.num_options.end())
mod_file_struct.order_option = max(mod_file_struct.order_option,atoi(it->second.c_str())); mod_file_struct.order_option = max(mod_file_struct.order_option,atoi(it->second.c_str()));
// This (temporary) check is present in stoch_simul, osr and ramsey_policy
if (options_list.num_options.find("simul") != options_list.num_options.end()
&& options_list.num_options.find("hp_filter") != options_list.num_options.end())
{
cerr << "ERROR: stoch_simul: HP filter is not yet implemented when computing empirical simulations" << endl;
exit(EXIT_FAILURE);
}
} }
void void
...@@ -216,6 +224,14 @@ RamseyPolicyStatement::checkPass(ModFileStructure &mod_file_struct) ...@@ -216,6 +224,14 @@ RamseyPolicyStatement::checkPass(ModFileStructure &mod_file_struct)
} }
mod_file_struct.order_option = max(mod_file_struct.order_option, order + 1); mod_file_struct.order_option = max(mod_file_struct.order_option, order + 1);
} }
// This (temporary) check is present in stoch_simul, osr and ramsey_policy
if (options_list.num_options.find("simul") != options_list.num_options.end()
&& options_list.num_options.find("hp_filter") != options_list.num_options.end())
{
cerr << "ERROR: ramsey_policy: HP filter is not yet implemented when computing empirical simulations" << endl;
exit(EXIT_FAILURE);
}
} }
void void
...@@ -715,6 +731,14 @@ OsrStatement::checkPass(ModFileStructure &mod_file_struct) ...@@ -715,6 +731,14 @@ OsrStatement::checkPass(ModFileStructure &mod_file_struct)
OptionsList::num_options_type::const_iterator it = options_list.num_options.find("order"); OptionsList::num_options_type::const_iterator it = options_list.num_options.find("order");
if (it != options_list.num_options.end()) if (it != options_list.num_options.end())
mod_file_struct.order_option = max(mod_file_struct.order_option,atoi(it->second.c_str())); mod_file_struct.order_option = max(mod_file_struct.order_option,atoi(it->second.c_str()));
// This (temporary) check is present in stoch_simul, osr and ramsey_policy
if (options_list.num_options.find("simul") != options_list.num_options.end()
&& options_list.num_options.find("hp_filter") != options_list.num_options.end())
{
cerr << "ERROR: osr: HP filter is not yet implemented when computing empirical simulations" << endl;
exit(EXIT_FAILURE);
}
} }
void void
......
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