From 44ce31dd2a190e9fad375aa354e3b38c0f8b3444 Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Fri, 8 Sep 2017 11:06:37 +0200 Subject: [PATCH 1/8] preprocessor: add backslashes to log output in latex. closes #1507 --- ExprNode.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ExprNode.cc b/ExprNode.cc index 4e09b5b0..60e46de0 100644 --- a/ExprNode.cc +++ b/ExprNode.cc @@ -2056,11 +2056,14 @@ UnaryOpNode::writeOutput(ostream &output, ExprNodeOutputType output_type, output << "exp"; break; case oLog: - output << "log"; + if (IS_LATEX(output_type)) + output << "\\log"; + else + output << "log"; break; case oLog10: if (IS_LATEX(output_type)) - output << "log_{10}"; + output << "\\log_{10}"; else output << "log10"; break; From dff540df4efbc0e403582feefe033e44578aaa01 Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Fri, 8 Sep 2017 16:18:48 +0200 Subject: [PATCH 2/8] preprocessor: allow passing mod file as string. Closes #1509 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Usage: ./dynare_m $'<>' The $’’ expands special characters. This is necessary because our setup for native matlab statements require that they end with a newline. In other words, the rest of the mod file can be sent on one line, but if there is a native matlab statement you must enter a `\n` after it. NB: In this case, apostrophes must be escaped: ' becomes \' e.g., to run tests/example1.mod: ./dynare_m $'//Example 1 from Collard\'s guide to Dynare\nvar y, c, k, a, h, b;varexo e, u;verbatim;% I want these comments included in\n% example1.m 1999q1 1999y\n%\nvar = 1;\nend;parameters beta, rho, alpha, delta, theta, psi, tau;alpha = 0.36;rho = 0.95;tau = 0.025;beta = 0.99;delta = 0.025;psi = 0;theta = 2.95;phi = 0.1;\nmodel;c*theta*h^(1+psi)=(1-alpha)*y;k = beta*(((exp(b)*c)/(exp(b(+1))*c(+1)))*(exp(b(+1))*alpha*y(+1)+(1-delta)*k));y = exp(a)*(k(-1)^alpha)*(h^(1-alpha));k = exp(b)*(y-c)+(1-delta)*k(-1);a = rho*a(-1)+tau*b(-1) + e;b = tau*a(-1)+rho*b(-1) + u;end;initval;y = 1.08068253095672;c = 0.80359242014163;h = 0.29175631001732;k = 11.08360443260358;a = 0;b = 0;e = 0;u = 0;end;shocks;var e; stderr 0.009;var u; stderr 0.009;var e, u = phi*0.009*0.009;end; stoch_simul;' --- DynareMain.cc | 38 +++++++++++++++++++++++++++++++------- DynareMain1.cc | 6 +++--- macro/MacroDriver.cc | 11 ++--------- macro/MacroDriver.hh | 2 +- 4 files changed, 37 insertions(+), 20 deletions(-) diff --git a/DynareMain.cc b/DynareMain.cc index 8176d6f9..d37b2314 100644 --- a/DynareMain.cc +++ b/DynareMain.cc @@ -48,9 +48,8 @@ void main2(stringstream &in, string &basename, bool debug, bool clear_all, bool , JsonOutputPointType json, JsonFileOutputType json_output_mode, bool onlyjson, bool jsonderivsimple ); -void main1(char *modfile, string &basename, bool debug, bool save_macro, string &save_macro_file, - bool no_line_macro, - map &defines, vector &path, stringstream ¯o_output); +void main1(string &modfile, string &basename, string &modfiletxt, bool debug, bool save_macro, string &save_macro_file, + bool no_line_macro, map &defines, vector &path, stringstream ¯o_output); void usage() @@ -339,9 +338,34 @@ main(int argc, char **argv) // Construct basename (i.e. remove file extension if there is one) string basename = argv[1]; - size_t pos = basename.find_last_of('.'); - if (pos != string::npos) - basename.erase(pos); + string modfile, modfiletxt; + size_t fsc = basename.find_first_of(';'); + if (fsc != string::npos) + { + // If a semicolon is found in argv[1], treat it as the text of the modfile + modfile = "mod_file_passed_as_string.mod"; + basename = "mod_file_passed_as_string"; + modfiletxt = argv[1]; + } + else + { + // If a semicolon is NOT found in argv[1], treat it as the name of the modfile + modfile = argv[1]; + size_t pos = basename.find_last_of('.'); + if (pos != string::npos) + basename.erase(pos); + + ifstream modfile(argv[1], ios::binary); + if (modfile.fail()) + { + cerr << "ERROR: Could not open file: " << argv[1] << endl; + exit(EXIT_FAILURE); + } + + stringstream buffer; + buffer << modfile.rdbuf(); + modfiletxt = buffer.str(); + } WarningConsolidation warnings(no_warn); @@ -360,7 +384,7 @@ main(int argc, char **argv) // Do macro processing stringstream macro_output; - main1(argv[1], basename, debug, save_macro, save_macro_file, no_line_macro, defines, path, macro_output); + main1(modfile, basename, modfiletxt, debug, save_macro, save_macro_file, no_line_macro, defines, path, macro_output); if (only_macro) return EXIT_SUCCESS; diff --git a/DynareMain1.cc b/DynareMain1.cc index 3cbd33f3..fe87ba83 100644 --- a/DynareMain1.cc +++ b/DynareMain1.cc @@ -23,13 +23,13 @@ #include "macro/MacroDriver.hh" void -main1(char *modfile, string &basename, bool debug, bool save_macro, string &save_macro_file, bool no_line_macro, - map &defines, vector &path, stringstream ¯o_output) +main1(string &modfile, string &basename, string &modfiletxt, bool debug, bool save_macro, string &save_macro_file, + bool no_line_macro, map &defines, vector &path, stringstream ¯o_output) { // Do macro processing MacroDriver m; - m.parse(modfile, macro_output, debug, no_line_macro, defines, path); + m.parse(modfile, modfiletxt, macro_output, debug, no_line_macro, defines, path); if (save_macro) { if (save_macro_file.empty()) diff --git a/macro/MacroDriver.cc b/macro/MacroDriver.cc index 71d53b9c..4d2399ec 100644 --- a/macro/MacroDriver.cc +++ b/macro/MacroDriver.cc @@ -37,18 +37,11 @@ MacroDriver::~MacroDriver() } void -MacroDriver::parse(const string &f, ostream &out, bool debug, bool no_line_macro, +MacroDriver::parse(const string &f, const string &modfiletxt, ostream &out, bool debug, bool no_line_macro, map defines, vector path) { file = f; - ifstream in(f.c_str(), ios::binary); - if (in.fail()) - { - cerr << "ERROR: Could not open file: " << f << endl; - exit(EXIT_FAILURE); - } - /* Copy the file into a stringstream, and add an extra end-of-line. This is a workaround for trac ticket #73: with this workaround, MOD files ending with @@ -66,7 +59,7 @@ MacroDriver::parse(const string &f, ostream &out, bool debug, bool no_line_macro { file_with_endl << "@#define " << it->first << " = \"" << it->second << "\"" << endl; } - file_with_endl << in.rdbuf() << endl; + file_with_endl << modfiletxt << endl; lexer = new MacroFlex(&file_with_endl, &out, no_line_macro, path); lexer->set_debug(debug); diff --git a/macro/MacroDriver.hh b/macro/MacroDriver.hh index 773a99dc..c76947de 100644 --- a/macro/MacroDriver.hh +++ b/macro/MacroDriver.hh @@ -182,7 +182,7 @@ public: //! Starts parsing a file, returns output in out /*! \param no_line_macro should we omit the @#line statements ? */ - void parse(const string &f, ostream &out, bool debug, bool no_line_macro, + void parse(const string &f, const string &modfiletxt, ostream &out, bool debug, bool no_line_macro, map defines, vector path); //! Name of main file being parsed From 5c24fea3227a946d8c4001094570ddcd038b8ff0 Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Mon, 11 Sep 2017 18:14:56 +0200 Subject: [PATCH 3/8] preprocessor: allow variables that become state variables in ramsey_policy to be set in histval. closes #1193 --- ComputingTasks.cc | 5 +++++ ModFile.cc | 23 +++++++++++++++++++++++ NumericalInitialization.cc | 3 +++ NumericalInitialization.hh | 3 +++ ParsingDriver.cc | 8 ++------ ParsingDriver.hh | 2 ++ Statement.hh | 4 ++++ 7 files changed, 42 insertions(+), 6 deletions(-) diff --git a/ComputingTasks.cc b/ComputingTasks.cc index 1926b67a..7bf65090 100644 --- a/ComputingTasks.cc +++ b/ComputingTasks.cc @@ -604,6 +604,11 @@ RamseyPolicyStatement::checkPass(ModFileStructure &mod_file_struct, WarningConso mod_file_struct.order_option = max(mod_file_struct.order_option, order + 1); } + OptionsList::symbol_list_options_t::const_iterator itsl = + options_list.symbol_list_options.find("instruments"); + if (itsl != options_list.symbol_list_options.end()) + mod_file_struct.ramsey_state_variables = itsl->second.get_symbols(); + // Fill in mod_file_struct.partial_information it = options_list.num_options.find("partial_information"); if (it != options_list.num_options.end() && it->second == "1") diff --git a/ModFile.cc b/ModFile.cc index 3af3faa5..32a72115 100644 --- a/ModFile.cc +++ b/ModFile.cc @@ -149,6 +149,29 @@ ModFile::checkPass(bool nostrict, bool stochastic) exit(EXIT_FAILURE); } + // Workaround for #1193 + if (!mod_file_struct.hist_vals_wrong_lag.empty()) + { + for (vector::const_iterator it = mod_file_struct.ramsey_state_variables.begin(); + it != mod_file_struct.ramsey_state_variables.end(); it++) + { + int symb_id = symbol_table.getID(*it); + map::const_iterator it1 = mod_file_struct.hist_vals_wrong_lag.find(symb_id); + if (it1 != mod_file_struct.hist_vals_wrong_lag.end() && it1->second < 0) + mod_file_struct.hist_vals_wrong_lag.erase(symb_id); + } + + if (!mod_file_struct.hist_vals_wrong_lag.empty()) + { + for (map::const_iterator it = mod_file_struct.hist_vals_wrong_lag.begin(); + it != mod_file_struct.hist_vals_wrong_lag.end(); it++) + cerr << "ERROR: histval: variable " << symbol_table.getName(it->first) + << " does not appear in the model with the lag " << it->second + << " (see the reference manual for the timing convention in 'histval')" << endl; + exit(EXIT_FAILURE); + } + } + if ((mod_file_struct.ramsey_model_present || mod_file_struct.ramsey_policy_present) && mod_file_struct.discretionary_policy_present) { diff --git a/NumericalInitialization.cc b/NumericalInitialization.cc index 84302651..ad199014 100644 --- a/NumericalInitialization.cc +++ b/NumericalInitialization.cc @@ -308,9 +308,11 @@ EndValStatement::writeJsonOutput(ostream &output) const } HistValStatement::HistValStatement(const hist_values_t &hist_values_arg, + const hist_vals_wrong_lag_t hist_vals_wrong_lag_arg, const SymbolTable &symbol_table_arg, const bool &all_values_required_arg) : hist_values(hist_values_arg), + hist_vals_wrong_lag(hist_vals_wrong_lag_arg), symbol_table(symbol_table_arg), all_values_required(all_values_required_arg) { @@ -356,6 +358,7 @@ HistValStatement::checkPass(ModFileStructure &mod_file_struct, WarningConsolidat if (unused_endo.size() > 0 || unused_exo.size() > 0) exit(EXIT_FAILURE); } + mod_file_struct.hist_vals_wrong_lag = hist_vals_wrong_lag; } void diff --git a/NumericalInitialization.hh b/NumericalInitialization.hh index 58a7e6e0..16f5acd1 100644 --- a/NumericalInitialization.hh +++ b/NumericalInitialization.hh @@ -107,12 +107,15 @@ public: Maps pairs (symbol_id, lag) to expr_t */ typedef map, expr_t> hist_values_t; + typedef map hist_vals_wrong_lag_t; private: const hist_values_t hist_values; + const hist_vals_wrong_lag_t hist_vals_wrong_lag; const SymbolTable &symbol_table; const bool all_values_required; public: HistValStatement(const hist_values_t &hist_values_arg, + const hist_vals_wrong_lag_t hist_vals_wrong_lag_arg, const SymbolTable &symbol_table_arg, const bool &all_values_required_arg); //! Workaround for trac ticket #157 diff --git a/ParsingDriver.cc b/ParsingDriver.cc index 565db4b1..52f1177b 100644 --- a/ParsingDriver.cc +++ b/ParsingDriver.cc @@ -549,11 +549,7 @@ ParsingDriver::hist_val(string *name, string *lag, expr_t rhs) pair key(symb_id, ilag); if (mod_file->dynamic_model.minLagForSymbol(symb_id) > ilag - 1) - { - ostringstream s; - s << ilag-1; - error("histval: variable " + *name + " does not appear in the model with the lag " + s.str() + " (see the reference manual for the timing convention in 'histval')"); - } + hist_vals_wrong_lag[symb_id] = ilag-1; if (hist_values.find(key) != hist_values.end()) error("hist_val: (" + *name + ", " + *lag + ") declared twice"); @@ -669,7 +665,7 @@ ParsingDriver::end_endval(bool all_values_required) void ParsingDriver::end_histval(bool all_values_required) { - mod_file->addStatement(new HistValStatement(hist_values, mod_file->symbol_table, all_values_required)); + mod_file->addStatement(new HistValStatement(hist_values, hist_vals_wrong_lag, mod_file->symbol_table, all_values_required)); hist_values.clear(); } diff --git a/ParsingDriver.hh b/ParsingDriver.hh index 2504b808..6a2da6ef 100644 --- a/ParsingDriver.hh +++ b/ParsingDriver.hh @@ -157,6 +157,8 @@ private: InitOrEndValStatement::init_values_t init_values; //! Temporary storage for histval blocks HistValStatement::hist_values_t hist_values; + //! Temporary storage for histval blocks + HistValStatement::hist_vals_wrong_lag_t hist_vals_wrong_lag; //! Temporary storage for homotopy_setup blocks HomotopyStatement::homotopy_values_t homotopy_values; //! Temporary storage for moment_calibration diff --git a/Statement.hh b/Statement.hh index db7d5606..70395a35 100644 --- a/Statement.hh +++ b/Statement.hh @@ -123,6 +123,10 @@ public: bool steady_state_model_present; //! Whether there is a write_latex_steady_state_model statement present bool write_latex_steady_state_model_present; + //! Set list of variables that become state variables when ramsey_policy is used + vector ramsey_state_variables; + //! Histval values that do not have the appropriate lag + map hist_vals_wrong_lag; }; class Statement From 6e2024b6edf03bbec9b5e151db7d04b9552ec254 Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Tue, 12 Sep 2017 13:29:43 +0200 Subject: [PATCH 4/8] preprocessor: remove commented RamseyConstraintsStatement code --- ComputingTasks.cc | 57 ----------------------------------------------- ComputingTasks.hh | 1 - 2 files changed, 58 deletions(-) diff --git a/ComputingTasks.cc b/ComputingTasks.cc index 7bf65090..3d97098f 100644 --- a/ComputingTasks.cc +++ b/ComputingTasks.cc @@ -514,63 +514,6 @@ RamseyConstraintsStatement::writeJsonOutput(ostream &output) const output << "}"; } -// Statement * -// RamseyConstraintsStatement::cloneAndReindexSymbIds(DataTree &dynamic_datatree, SymbolTable &orig_symbol_table) -// { -// vector errors; -// SymbolList new_symbol_list, new_options_symbol_list; -// OptionsList new_options_list = options_list; -// SymbolTable *new_symbol_table = dynamic_datatree.getSymbolTable(); -// vector symbols = symbol_list.get_symbols(); - -// for (vector::const_iterator it = symbols.begin(); it != symbols.end(); it++) -// try -// { -// new_symbol_table->getID(*it); -// new_symbol_list.addSymbol(*it); -// } -// catch (SymbolTable::UnknownSymbolIDException &e) -// { -// errors.push_back(orig_symbol_table.getName(e.id)); -// } -// catch (SymbolTable::UnknownSymbolNameException &e) -// { -// errors.push_back(e.name); -// } - -// OptionsList::symbol_list_options_t::const_iterator it = options_list.symbol_list_options.find("instruments"); -// if (it != options_list.symbol_list_options.end()) -// { -// symbols = it->second.get_symbols(); -// for (vector::const_iterator it1 = symbols.begin(); it1 != symbols.end(); it1++) -// try -// { -// new_symbol_table->getID(*it1); -// new_options_symbol_list.addSymbol(*it1); -// } -// catch (SymbolTable::UnknownSymbolIDException &e) -// { -// errors.push_back(orig_symbol_table.getName(e.id)); -// } -// catch (SymbolTable::UnknownSymbolNameException &e) -// { -// errors.push_back(e.name); -// } -// new_options_list.symbol_list_options["instruments"] = new_options_symbol_list; -// } - -// if (!errors.empty()) -// { -// cerr << endl -// << "ERROR: The following vars were used in the ramsey_policy statement(s) but were not declared." << endl -// << " This likely means that you declared them as varexo and that they're not in the model" << endl; -// for (vector::const_iterator it = errors.begin(); it != errors.end(); it++) -// cerr << *it << endl; -// exit(EXIT_FAILURE); -// } -// return new RamseyPolicyStatement(new_symbol_list, options_list); -// } - RamseyPolicyStatement::RamseyPolicyStatement(const SymbolTable &symbol_table_arg, const vector &ramsey_policy_list_arg, const OptionsList &options_list_arg) : diff --git a/ComputingTasks.hh b/ComputingTasks.hh index 18ec20d1..bd58c215 100644 --- a/ComputingTasks.hh +++ b/ComputingTasks.hh @@ -160,7 +160,6 @@ public: virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings); virtual void writeOutput(ostream &output, const string &basename, bool minimal_workspace) const; virtual void writeJsonOutput(ostream &output) const; - // virtual Statement *cloneAndReindexSymbIds(DataTree &dynamic_datatree, SymbolTable &orig_symbol_table); }; class RamseyPolicyStatement : public Statement From 7c884bcae26ce66f6f5e7373e891eec37ce9382a Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Tue, 12 Sep 2017 14:01:25 +0200 Subject: [PATCH 5/8] preprocessor: remove size filed in Symbol Table class. closes #1380 --- SymbolTable.cc | 14 +++++++------- SymbolTable.hh | 15 ++++++--------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/SymbolTable.cc b/SymbolTable.cc index 7a2a3da4..dca0ea8f 100644 --- a/SymbolTable.cc +++ b/SymbolTable.cc @@ -38,7 +38,7 @@ AuxVarInfo::AuxVarInfo(int symb_id_arg, aux_var_t type_arg, int orig_symb_id_arg { } -SymbolTable::SymbolTable() : frozen(false), size(0) +SymbolTable::SymbolTable() : frozen(false) { } @@ -78,7 +78,7 @@ SymbolTable::addSymbol(const string &name, SymbolType type, const string &tex_na else non_long_name_partition_exists = true; - int id = size++; + int id = symbol_table.size(); symbol_table[name] = id; type_table.push_back(type); @@ -110,7 +110,7 @@ SymbolTable::freeze() throw (FrozenException) frozen = true; - for (int i = 0; i < size; i++) + for (int i = 0; i < symbol_table.size(); i++) { int tsi; switch (getType(i)) @@ -156,7 +156,7 @@ SymbolTable::changeType(int id, SymbolType newtype) throw (UnknownSymbolIDExcept if (frozen) throw FrozenException(); - if (id < 0 || id >= size) + if (id < 0 || id > symbol_table.size()) throw UnknownSymbolIDException(id); type_table[id] = newtype; @@ -732,7 +732,7 @@ SymbolTable::getAuxiliaryVarsExprNode(int symb_id) const throw (SearchFailedExce void SymbolTable::markPredetermined(int symb_id) throw (UnknownSymbolIDException, FrozenException) { - if (symb_id < 0 || symb_id >= size) + if (symb_id < 0 || symb_id > symbol_table.size()) throw UnknownSymbolIDException(symb_id); if (frozen) throw FrozenException(); @@ -745,7 +745,7 @@ SymbolTable::markPredetermined(int symb_id) throw (UnknownSymbolIDException, Fro bool SymbolTable::isPredetermined(int symb_id) const throw (UnknownSymbolIDException) { - if (symb_id < 0 || symb_id >= size) + if (symb_id < 0 || symb_id > symbol_table.size()) throw UnknownSymbolIDException(symb_id); return (predetermined_variables.find(symb_id) != predetermined_variables.end()); @@ -760,7 +760,7 @@ SymbolTable::predeterminedNbr() const void SymbolTable::addObservedVariable(int symb_id) throw (UnknownSymbolIDException) { - if (symb_id < 0 || symb_id >= size) + if (symb_id < 0 || symb_id > symbol_table.size()) throw UnknownSymbolIDException(symb_id); assert(getType(symb_id) == eEndogenous); diff --git a/SymbolTable.hh b/SymbolTable.hh index fb9a54dd..20a7d573 100644 --- a/SymbolTable.hh +++ b/SymbolTable.hh @@ -111,9 +111,6 @@ private: //! Has method freeze() been called? bool frozen; - //! Number of symbols contained in the table - int size; - typedef map symbol_table_type; //! Maps strings to symbol IDs symbol_table_type symbol_table; @@ -375,7 +372,7 @@ SymbolTable::exists(const string &name) const inline string SymbolTable::getName(int id) const throw (UnknownSymbolIDException) { - if (id < 0 || id >= size) + if (id < 0 || id > symbol_table.size()) throw UnknownSymbolIDException(id); else return name_table[id]; @@ -384,7 +381,7 @@ SymbolTable::getName(int id) const throw (UnknownSymbolIDException) inline string SymbolTable::getTeXName(int id) const throw (UnknownSymbolIDException) { - if (id < 0 || id >= size) + if (id < 0 || id > symbol_table.size()) throw UnknownSymbolIDException(id); else return tex_name_table[id]; @@ -393,7 +390,7 @@ SymbolTable::getTeXName(int id) const throw (UnknownSymbolIDException) inline string SymbolTable::getLongName(int id) const throw (UnknownSymbolIDException) { - if (id < 0 || id >= size) + if (id < 0 || id > symbol_table.size()) throw UnknownSymbolIDException(id); else return long_name_table[id]; @@ -402,7 +399,7 @@ SymbolTable::getLongName(int id) const throw (UnknownSymbolIDException) inline SymbolType SymbolTable::getType(int id) const throw (UnknownSymbolIDException) { - if (id < 0 || id >= size) + if (id < 0 || id > symbol_table.size()) throw UnknownSymbolIDException(id); else return type_table[id]; @@ -430,7 +427,7 @@ SymbolTable::getTypeSpecificID(int id) const throw (UnknownSymbolIDException, No if (!frozen) throw NotYetFrozenException(); - if (id < 0 || id >= size) + if (id < 0 || id > symbol_table.size()) throw UnknownSymbolIDException(id); return type_specific_ids[id]; @@ -481,7 +478,7 @@ SymbolTable::param_nbr() const throw (NotYetFrozenException) inline int SymbolTable::maxID() { - return (size-1); + return symbol_table.size() - 1; } inline int From 4213c42b96120fccc340e012fbe83250d08b7c81 Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Tue, 12 Sep 2017 14:16:29 +0200 Subject: [PATCH 6/8] preprocessor: factorize code that checks for valid symb_id --- SymbolTable.cc | 15 +++++---------- SymbolTable.hh | 36 ++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/SymbolTable.cc b/SymbolTable.cc index dca0ea8f..cf986b41 100644 --- a/SymbolTable.cc +++ b/SymbolTable.cc @@ -156,8 +156,7 @@ SymbolTable::changeType(int id, SymbolType newtype) throw (UnknownSymbolIDExcept if (frozen) throw FrozenException(); - if (id < 0 || id > symbol_table.size()) - throw UnknownSymbolIDException(id); + validateSymbID(id); type_table[id] = newtype; } @@ -732,8 +731,8 @@ SymbolTable::getAuxiliaryVarsExprNode(int symb_id) const throw (SearchFailedExce void SymbolTable::markPredetermined(int symb_id) throw (UnknownSymbolIDException, FrozenException) { - if (symb_id < 0 || symb_id > symbol_table.size()) - throw UnknownSymbolIDException(symb_id); + validateSymbID(symb_id); + if (frozen) throw FrozenException(); @@ -745,9 +744,7 @@ SymbolTable::markPredetermined(int symb_id) throw (UnknownSymbolIDException, Fro bool SymbolTable::isPredetermined(int symb_id) const throw (UnknownSymbolIDException) { - if (symb_id < 0 || symb_id > symbol_table.size()) - throw UnknownSymbolIDException(symb_id); - + validateSymbID(symb_id); return (predetermined_variables.find(symb_id) != predetermined_variables.end()); } @@ -760,9 +757,7 @@ SymbolTable::predeterminedNbr() const void SymbolTable::addObservedVariable(int symb_id) throw (UnknownSymbolIDException) { - if (symb_id < 0 || symb_id > symbol_table.size()) - throw UnknownSymbolIDException(symb_id); - + validateSymbID(symb_id); assert(getType(symb_id) == eEndogenous); varobs.push_back(symb_id); } diff --git a/SymbolTable.hh b/SymbolTable.hh index 20a7d573..b97ad162 100644 --- a/SymbolTable.hh +++ b/SymbolTable.hh @@ -219,6 +219,8 @@ private: int addLeadAuxiliaryVarInternal(bool endo, int index, expr_t arg) throw (FrozenException); //! Factorized code for Json writing void writeJsonVarVector(ostream &output, const vector &varvec) const; + //! Factorized code for asserting that 0 <= symb_id <= symbol_table.size() + inline void validateSymbID(int symb_id) const throw (UnknownSymbolIDException); public: //! Add a symbol /*! Returns the symbol ID */ @@ -362,6 +364,13 @@ public: set getOrigEndogenous() const; }; +inline void +SymbolTable::validateSymbID(int symb_id) const throw (UnknownSymbolIDException) +{ + if (symb_id < 0 || symb_id > symbol_table.size()) + throw UnknownSymbolIDException(symb_id); +} + inline bool SymbolTable::exists(const string &name) const { @@ -372,37 +381,29 @@ SymbolTable::exists(const string &name) const inline string SymbolTable::getName(int id) const throw (UnknownSymbolIDException) { - if (id < 0 || id > symbol_table.size()) - throw UnknownSymbolIDException(id); - else - return name_table[id]; + validateSymbID(id); + return name_table[id]; } inline string SymbolTable::getTeXName(int id) const throw (UnknownSymbolIDException) { - if (id < 0 || id > symbol_table.size()) - throw UnknownSymbolIDException(id); - else - return tex_name_table[id]; + validateSymbID(id); + return tex_name_table[id]; } inline string SymbolTable::getLongName(int id) const throw (UnknownSymbolIDException) { - if (id < 0 || id > symbol_table.size()) - throw UnknownSymbolIDException(id); - else - return long_name_table[id]; + validateSymbID(id); + return long_name_table[id]; } inline SymbolType SymbolTable::getType(int id) const throw (UnknownSymbolIDException) { - if (id < 0 || id > symbol_table.size()) - throw UnknownSymbolIDException(id); - else - return type_table[id]; + validateSymbID(id); + return type_table[id]; } inline SymbolType @@ -427,8 +428,7 @@ SymbolTable::getTypeSpecificID(int id) const throw (UnknownSymbolIDException, No if (!frozen) throw NotYetFrozenException(); - if (id < 0 || id > symbol_table.size()) - throw UnknownSymbolIDException(id); + validateSymbID(id); return type_specific_ids[id]; } From 113b8799f3e1c05ecd0469755a74e2cb964fffe0 Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Wed, 13 Sep 2017 10:16:19 +0200 Subject: [PATCH 7/8] preprocessor: histval should only accept lag values <= 0. closes #1510 --- ParsingDriver.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ParsingDriver.cc b/ParsingDriver.cc index 52f1177b..30c4336a 100644 --- a/ParsingDriver.cc +++ b/ParsingDriver.cc @@ -546,6 +546,9 @@ ParsingDriver::hist_val(string *name, string *lag, expr_t rhs) error("histval: " + *name + " should be an endogenous or exogenous variable"); int ilag = atoi(lag->c_str()); + if (ilag > 0) + error("histval: the lag on " + *name + " should be less than or equal to 0"); + pair key(symb_id, ilag); if (mod_file->dynamic_model.minLagForSymbol(symb_id) > ilag - 1) From 620f04a422ddeb6a36525f1df21b8ebfc21d3f3a Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Wed, 13 Sep 2017 11:36:14 +0200 Subject: [PATCH 8/8] preprocessor: histval lag check must be made after transformation to the dynamic model due to ramsey_policy. closes #1193 --- ComputingTasks.cc | 5 ----- ModFile.cc | 40 +++++++++++++++++----------------------- ParsingDriver.cc | 2 +- Statement.hh | 2 -- 4 files changed, 18 insertions(+), 31 deletions(-) diff --git a/ComputingTasks.cc b/ComputingTasks.cc index 3d97098f..9ff522f8 100644 --- a/ComputingTasks.cc +++ b/ComputingTasks.cc @@ -547,11 +547,6 @@ RamseyPolicyStatement::checkPass(ModFileStructure &mod_file_struct, WarningConso mod_file_struct.order_option = max(mod_file_struct.order_option, order + 1); } - OptionsList::symbol_list_options_t::const_iterator itsl = - options_list.symbol_list_options.find("instruments"); - if (itsl != options_list.symbol_list_options.end()) - mod_file_struct.ramsey_state_variables = itsl->second.get_symbols(); - // Fill in mod_file_struct.partial_information it = options_list.num_options.find("partial_information"); if (it != options_list.num_options.end() && it->second == "1") diff --git a/ModFile.cc b/ModFile.cc index 32a72115..42fa7f64 100644 --- a/ModFile.cc +++ b/ModFile.cc @@ -149,29 +149,6 @@ ModFile::checkPass(bool nostrict, bool stochastic) exit(EXIT_FAILURE); } - // Workaround for #1193 - if (!mod_file_struct.hist_vals_wrong_lag.empty()) - { - for (vector::const_iterator it = mod_file_struct.ramsey_state_variables.begin(); - it != mod_file_struct.ramsey_state_variables.end(); it++) - { - int symb_id = symbol_table.getID(*it); - map::const_iterator it1 = mod_file_struct.hist_vals_wrong_lag.find(symb_id); - if (it1 != mod_file_struct.hist_vals_wrong_lag.end() && it1->second < 0) - mod_file_struct.hist_vals_wrong_lag.erase(symb_id); - } - - if (!mod_file_struct.hist_vals_wrong_lag.empty()) - { - for (map::const_iterator it = mod_file_struct.hist_vals_wrong_lag.begin(); - it != mod_file_struct.hist_vals_wrong_lag.end(); it++) - cerr << "ERROR: histval: variable " << symbol_table.getName(it->first) - << " does not appear in the model with the lag " << it->second - << " (see the reference manual for the timing convention in 'histval')" << endl; - exit(EXIT_FAILURE); - } - } - if ((mod_file_struct.ramsey_model_present || mod_file_struct.ramsey_policy_present) && mod_file_struct.discretionary_policy_present) { @@ -417,6 +394,23 @@ ModFile::transformPass(bool nostrict, bool stochastic, bool compute_xrefs) mod_file_struct.ramsey_eq_nbr = dynamic_model.equation_number() - mod_file_struct.orig_eq_nbr; } + // Workaround for #1193 + if (!mod_file_struct.hist_vals_wrong_lag.empty()) + { + bool err = false; + for (map::const_iterator it = mod_file_struct.hist_vals_wrong_lag.begin(); + it != mod_file_struct.hist_vals_wrong_lag.end(); it++) + if (dynamic_model.minLagForSymbol(it->first) > it->second - 1) + { + cerr << "ERROR: histval: variable " << symbol_table.getName(it->first) + << " does not appear in the model with the lag " << it->second - 1 + << " (see the reference manual for the timing convention in 'histval')" << endl; + err = true; + } + if (err) + exit(EXIT_FAILURE); + } + if (mod_file_struct.stoch_simul_present || mod_file_struct.estimation_present || mod_file_struct.osr_present diff --git a/ParsingDriver.cc b/ParsingDriver.cc index 30c4336a..41972786 100644 --- a/ParsingDriver.cc +++ b/ParsingDriver.cc @@ -552,7 +552,7 @@ ParsingDriver::hist_val(string *name, string *lag, expr_t rhs) pair key(symb_id, ilag); if (mod_file->dynamic_model.minLagForSymbol(symb_id) > ilag - 1) - hist_vals_wrong_lag[symb_id] = ilag-1; + hist_vals_wrong_lag[symb_id] = ilag; if (hist_values.find(key) != hist_values.end()) error("hist_val: (" + *name + ", " + *lag + ") declared twice"); diff --git a/Statement.hh b/Statement.hh index 70395a35..a6a1d5c3 100644 --- a/Statement.hh +++ b/Statement.hh @@ -123,8 +123,6 @@ public: bool steady_state_model_present; //! Whether there is a write_latex_steady_state_model statement present bool write_latex_steady_state_model_present; - //! Set list of variables that become state variables when ramsey_policy is used - vector ramsey_state_variables; //! Histval values that do not have the appropriate lag map hist_vals_wrong_lag; };