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

Fix bugs introduced in d3e115194b 

Ref. #65
issue#70
Sébastien Villemot 2021-02-19 20:11:33 +01:00
parent 4798a5e2bc
commit 825b9ee8ef
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ExprNode.cc
View File

@ -1636,9 +1636,9 @@ VariableNode::decreaseLeadsLags(int n) const
expr_t
VariableNode::decreaseLeadsLagsPredeterminedVariables() const
{
if (get_type() == SymbolType::modelLocalVariable)
return datatree.getLocalVariable(symb_id)->decreaseLeadsLagsPredeterminedVariables();
/* Do not recurse into model-local variables definitions, since MLVs are
already handled by DynamicModel::transformPredeterminedVariables().
This is also necessary because of #65. */
if (datatree.symbol_table.isPredetermined(symb_id))
return decreaseLeadsLags(1);
else
@ -1987,8 +1987,9 @@ VariableNode::getEndosAndMaxLags(map<string, int> &model_endos_and_lags) const
expr_t
VariableNode::replaceVarsInEquation(map<VariableNode *, NumConstNode *> &table) const
{
/* Do not recurse into model-local variables definition, because otherwise
this would substitute MLV in the original model (see #65). */
/* Do not recurse into model-local variables definitions, since MLVs are
already handled by ModelTree::simplifyEquations().
This is also necessary because of #65. */
for (auto &it : table)
if (it.first->symb_id == symb_id)
return it.second;

2
src/ModelTree.cc
View File

@ -1639,6 +1639,8 @@ ModelTree::simplifyEquations()
while (subst_table.size() != last_subst_table_size)
{
last_subst_table_size = subst_table.size();
for (auto &[id, definition] : local_variables_table)
definition = definition->replaceVarsInEquation(subst_table);
for (auto &equation : equations)
equation = dynamic_cast<BinaryOpNode *>(equation->replaceVarsInEquation(subst_table));
subst_table.clear();