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

Fix check for the presence of ramsey_{model,policy} when ramsey_constraints is used 

The existing check would incorrectly fail if ramsey_constraints appeared before
ramsey_{model,policy}.

Also, the check would not terminate the processing in case of error.

Closes: #91
fix-tolerance-parameters
Sébastien Villemot 2022-04-11 12:26:14 +02:00
parent 621134b8d8
commit a431682697
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ComputingTasks.cc
View File

@ -545,8 +545,7 @@ RamseyConstraintsStatement::RamseyConstraintsStatement(const SymbolTable &symbol
void
RamseyConstraintsStatement::checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings)
{
if (!mod_file_struct.ramsey_model_present && !mod_file_struct.ramsey_policy_present)
cerr << "ramsey_constraints: can only be used with ramsey_model or ramsey_policy" << endl;
mod_file_struct.ramsey_constraints_present = true;
}
void

6
src/ModFile.cc
View File

@ -170,6 +170,12 @@ ModFile::checkPass(bool nostrict, bool stochastic)
exit(EXIT_FAILURE);
}
if (mod_file_struct.ramsey_constraints_present && !mod_file_struct.ramsey_model_present && !mod_file_struct.ramsey_policy_present)
{
cerr << "ERROR: A ramsey_constraints block requires the presence of a ramsey_model or ramsey_policy statement" << endl;
exit(EXIT_FAILURE);
}
if ((mod_file_struct.osr_present && (!mod_file_struct.osr_params_present || !mod_file_struct.optim_weights_present))
|| ((!mod_file_struct.osr_present || !mod_file_struct.osr_params_present) && mod_file_struct.optim_weights_present)
|| ((!mod_file_struct.osr_present || !mod_file_struct.optim_weights_present) && mod_file_struct.osr_params_present))

4
src/Statement.hh
View File

@ -1,5 +1,5 @@
/*
* Copyright © 2006-2021 Dynare Team
* Copyright © 2006-2022 Dynare Team
*
* This file is part of Dynare.
*
@ -149,6 +149,8 @@ public:
bool shocks_surprise_present{false};
// Whether an occbin_constraints block appears
bool occbin_constraints_present{false};
// Whether a ramsey_constraints block appears
bool ramsey_constraints_present{false};
};
class Statement