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

preprocessor: take care of exos in smoother2histval statement

issue#70
Houtan Bastani 2015-04-14 15:04:46 +02:00
parent ca233d8bf1
commit f76a6cb58b
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ComputingTasks.cc
View File

@ -3794,6 +3794,41 @@ Smoother2histvalStatement::Smoother2histvalStatement(const OptionsList &options_
{
}
Statement *
Smoother2histvalStatement::cloneAndReindexSymbIds(DataTree &dynamic_datatree, SymbolTable &orig_symbol_table)
{
SymbolList new_options_symbol_list;
OptionsList new_options_list = options_list;
try
{
SymbolTable *new_symbol_table = dynamic_datatree.getSymbolTable();
string opts_to_check[] = {"invars", "outvars"};
vector<string> opts (opts_to_check, opts_to_check + sizeof(opts_to_check)/sizeof(string));
for (vector<string>::const_iterator it=opts.begin(); it != opts.end(); it++)
{
OptionsList::symbol_list_options_t::const_iterator it1 =
options_list.symbol_list_options.find(*it);
if (it1 != options_list.symbol_list_options.end())
{
vector<string> symbols = it1->second.get_symbols();
for (vector<string>::const_iterator it2 = symbols.begin(); it2 != symbols.end(); it2++)
{
new_symbol_table->getID(*it2);
new_options_symbol_list.addSymbol(*it2);
}
new_options_list.symbol_list_options[*it] = new_options_symbol_list;
}
}
}
catch (...)
{
cerr << "ERROR: A variable in the smoother2histval 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 Smoother2histvalStatement(new_options_list);
}
void
Smoother2histvalStatement::writeOutput(ostream &output, const string &basename) const
{

1
ComputingTasks.hh
View File

@ -926,6 +926,7 @@ private:
public:
Smoother2histvalStatement(const OptionsList &options_list_arg);
virtual void writeOutput(ostream &output, const string &basename) const;
virtual Statement *cloneAndReindexSymbIds(DataTree &dynamic_datatree, SymbolTable &orig_symbol_table);
};
#endif