From 71f76cdaa6688ff1595e2f8d6c2bc21e428c164f Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Tue, 31 Mar 2015 17:41:41 +0200 Subject: [PATCH] preprocessor: take care of extra exos in forecast statement --- ComputingTasks.cc | 23 +++++++++++++++++++++++ ComputingTasks.hh | 1 + 2 files changed, 24 insertions(+) diff --git a/ComputingTasks.cc b/ComputingTasks.cc index 18d54db9..7fc5d59e 100644 --- a/ComputingTasks.cc +++ b/ComputingTasks.cc @@ -223,6 +223,29 @@ ForecastStatement::ForecastStatement(const SymbolList &symbol_list_arg, { } +Statement * +ForecastStatement::cloneAndReindexSymbIds(DataTree &dynamic_datatree, SymbolTable &orig_symbol_table) +{ + SymbolList new_symbol_list; + try + { + SymbolTable *new_symbol_table = dynamic_datatree.getSymbolTable(); + vector symbols = symbol_list.get_symbols(); + for (vector::const_iterator it = symbols.begin(); it != symbols.end(); it++) + { + new_symbol_table->getID(*it); + new_symbol_list.addSymbol(*it); + } + } + catch (SymbolTable::UnknownSymbolNameException &e) + { + cerr << "ERROR: A variable in the forecast statement was not found in the symbol table" << endl + << " This likely means that you have declared a varexo that is not used in the model" << endl; + exit(EXIT_FAILURE); + } + return new ForecastStatement(new_symbol_list, options_list); +} + void ForecastStatement::writeOutput(ostream &output, const string &basename) const { diff --git a/ComputingTasks.hh b/ComputingTasks.hh index d84ef1af..bc7dbcb1 100644 --- a/ComputingTasks.hh +++ b/ComputingTasks.hh @@ -109,6 +109,7 @@ public: ForecastStatement(const SymbolList &symbol_list_arg, const OptionsList &options_list_arg); virtual void writeOutput(ostream &output, const string &basename) const; + virtual Statement *cloneAndReindexSymbIds(DataTree &dynamic_datatree, SymbolTable &orig_symbol_table); }; class RamseyModelStatement : public Statement