From 1b81049cb04229d6fa3fb10787a494777aa365af Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Thu, 9 Apr 2015 12:04:36 +0200 Subject: [PATCH] preprocessor: take care of extra exos in shock_decomposition --- ComputingTasks.cc | 23 +++++++++++++++++++++++ ComputingTasks.hh | 1 + 2 files changed, 24 insertions(+) diff --git a/ComputingTasks.cc b/ComputingTasks.cc index caad9f15..c4dc0778 100644 --- a/ComputingTasks.cc +++ b/ComputingTasks.cc @@ -1946,6 +1946,29 @@ ShockDecompositionStatement::ShockDecompositionStatement(const SymbolList &symbo { } +Statement * +ShockDecompositionStatement::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 shock_decomposition 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 ShockDecompositionStatement(new_symbol_list, options_list); +} + void ShockDecompositionStatement::writeOutput(ostream &output, const string &basename) const { diff --git a/ComputingTasks.hh b/ComputingTasks.hh index 7d8a7a3b..03b1f4ce 100644 --- a/ComputingTasks.hh +++ b/ComputingTasks.hh @@ -544,6 +544,7 @@ public: ShockDecompositionStatement(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 ConditionalForecastStatement : public Statement