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

Fix regression in nested diffs introduced in 90d8b579 

See McModelTeam/McModelProject/issues/97.
issue#70
Sébastien Villemot 2018-07-30 12:53:23 +02:00
parent b9ee0bb204
commit 45cd8e6853
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/DynamicModel.cc
View File

@ -5391,7 +5391,10 @@ DynamicModel::substituteDiff(StaticModel &static_model, ExprNode::subst_table_t
auto iterator_arg_max_lag = it.second.rbegin();
int arg_max_lag = iterator_arg_max_lag->first;
expr_t arg_max_expr = iterator_arg_max_lag->second;
while (arg_max_lag < 0)
/* We compare arg_max_lag with the result of countDiffs(), in order to
properly handle nested diffs. See McModelTeam/McModelProject/issues/97 */
while (arg_max_lag < 1 - it.first->countDiffs())
{
arg_max_lag++;
arg_max_expr = arg_max_expr->decreaseLeadsLags(-1);