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

Revert "preprocessor: replace extra exos in steady state model" 

This reverts commit 8bc946c148b3e3321e23bfbace19c91feb2893dc.
issue#70
Houtan Bastani 2015-06-09 16:40:14 +02:00
parent 3740c4a28b
commit 8fe889bf2f
3 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ModFile.cc
View File

@ -315,7 +315,6 @@ 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();

33
SteadyStateModel.cc
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010-2015 Dynare Team
* Copyright (C) 2010-2014 Dynare Team
*
* This file is part of Dynare.
*
@ -104,37 +104,6 @@ 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
{

4
SteadyStateModel.hh
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010-2015 Dynare Team
* Copyright (C) 2010-2014 Dynare Team
*
* This file is part of Dynare.
*
@ -51,8 +51,6 @@ 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