stepan
/
preprocessor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tune_jscale' into 'master' 

Fix faulty logic in checks for mh_tune_jscale

Closes #46

See merge request Dynare/preprocessor!25
issue#70
Sébastien Villemot 2020-07-21 08:59:20 +00:00
parent 4be0d7b8c7 eb464665ac
commit f2f6097777
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ComputingTasks.cc
View File

@ -1219,19 +1219,21 @@ EstimationStatement::checkPass(ModFileStructure &mod_file_struct, WarningConsoli
exit(EXIT_FAILURE);
}
if (options_list.num_options.find("mh_tune_jscale.target") != options_list.num_options.end()
&& options_list.num_options.find("mh_jscale") != options_list.num_options.end())
if (auto it = options_list.num_options.find("mh_tune_jscale.status");
it != options_list.num_options.end() && it->second == "true")
{
cerr << "ERROR: The mh_tune_jscale and mh_jscale options of the estimation statement are incompatible." << endl;
exit(EXIT_FAILURE);
if (options_list.num_options.find("mh_jscale") != options_list.num_options.end())
{
cerr << "ERROR: The mh_tune_jscale and mh_jscale options of the estimation statement are incompatible." << endl;
exit(EXIT_FAILURE);
}
}
if (options_list.num_options.find("mh_tune_jscale.guess") != options_list.num_options.end()
&& options_list.num_options.find("mh_tune_jscale.target") == options_list.num_options.end())
else if (options_list.num_options.find("mh_tune_jscale.guess") != options_list.num_options.end())
{
cerr << "ERROR: The option mh_tune_guess in estimation statement cannot be used without option mh_tune_jscale." << endl;
exit(EXIT_FAILURE);
}
/* Check that we are not trying to estimate a parameter appearing in the
planner discount factor (see dynare#1173) */