diff --git a/ModFile.cc b/ModFile.cc index 862fd4ca66ce6210d3eb89acbd1cccafdd86c928..97ec4a2097323622ffb3275acbcb91311747d562 100644 --- a/ModFile.cc +++ b/ModFile.cc @@ -315,6 +315,7 @@ ModFile::transformPass(bool nostrict) symbol_table.rmExo(unusedExo); dynamic_model.reindex(orig_symbol_table); external_functions_table.reindex(symbol_table, orig_symbol_table); + steady_state_model.reindex(orig_symbol_table); vector<Statement *> orig_statements = statements; statements.clear(); diff --git a/SteadyStateModel.cc b/SteadyStateModel.cc index 7712e9f24fcd6c9c29433d9be903014e47ae1579..86599eaaf17f185c5ec08e2566860dfe6128c2d7 100644 --- a/SteadyStateModel.cc +++ b/SteadyStateModel.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2014 Dynare Team + * Copyright (C) 2010-2015 Dynare Team * * This file is part of Dynare. * @@ -104,6 +104,37 @@ SteadyStateModel::checkPass(bool ramsey_model, WarningConsolidation &warnings) c } } +void +SteadyStateModel::reindex(SymbolTable orig_symbol_table) +{ + if (def_table.empty()) + return; + + DataTree *dt = dynamic_cast<DataTree *> (this); + vector<int> new_symb_ids; + vector<pair<vector<int>, expr_t> > orig_def_table = def_table; + def_table.clear(); + for (vector<pair<vector<int>, expr_t> >::const_iterator it = orig_def_table.begin(); + it != orig_def_table.end(); it++) + try + { + new_symb_ids.clear(); + for (vector<int>::const_iterator it1 = it->first.begin(); + it1 != it->first.end(); it1++) + if (symbol_table.getName(*it1) == orig_symbol_table.getName(*it1)) + new_symb_ids.push_back(*it1); + else + new_symb_ids.push_back(symbol_table.getID(orig_symbol_table.getName(*it1))); + addMultipleDefinitions(new_symb_ids, + it->second->cloneDynamicReindex(*dt, orig_symbol_table)); + } + catch (...) + { + cerr << "ERROR: an unused exogenous variable was found in the steady_state_model block" << endl; + exit(EXIT_FAILURE); + } +} + void SteadyStateModel::writeSteadyStateFile(const string &basename, bool ramsey_model) const { diff --git a/SteadyStateModel.hh b/SteadyStateModel.hh index 64b78573b88ae2ae39affa803cb372e3dc1c1b64..8ed9d97d8b7cf50bdf8395f7bcb0dfd3605b35c1 100644 --- a/SteadyStateModel.hh +++ b/SteadyStateModel.hh @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2014 Dynare Team + * Copyright (C) 2010-2015 Dynare Team * * This file is part of Dynare. * @@ -51,6 +51,8 @@ public: void writeSteadyStateFile(const string &basename, bool ramsey_model) const; // in ExternalFiles.cc void writeSteadyStateFileC(const string &basename, bool ramsey_model) const; + //! Used to reindex def_table after removal of extra exogenous + void reindex(SymbolTable orig_symbol_table); }; #endif