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

preprocessor: take care of extra exos in dynatype

issue#70
Houtan Bastani 2015-04-03 17:15:01 +02:00
parent 0c6f84bdcf
commit 47d0516d4f
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ComputingTasks.cc
View File

@ -1462,6 +1462,29 @@ DynaTypeStatement::DynaTypeStatement(const SymbolList &symbol_list_arg,
{
}
Statement *
DynaTypeStatement::cloneAndReindexSymbIds(DataTree &dynamic_datatree, SymbolTable &orig_symbol_table)
{
SymbolList new_symbol_list;
try
{
SymbolTable *new_symbol_table = dynamic_datatree.getSymbolTable();
vector<string> symbols = symbol_list.get_symbols();
for (vector<string>::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 dynatype 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 DynaTypeStatement(new_symbol_list, filename);
}
void
DynaTypeStatement::writeOutput(ostream &output, const string &basename) const
{

1
ComputingTasks.hh
View File

@ -258,6 +258,7 @@ public:
DynaTypeStatement(const SymbolList &symbol_list_arg,
const string &filename_arg);
virtual void writeOutput(ostream &output, const string &basename) const;
virtual Statement *cloneAndReindexSymbIds(DataTree &dynamic_datatree, SymbolTable &orig_symbol_table);
};
class DynaSaveStatement : public Statement