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

Symbolic detrending engine: correctly handle equations marked [static] 

Incidentally, this also fixes a detrending bug in the Occbin engine (since the
latter internally generates a [static] equation).

Ref. dynare#1827

By the way, perform a small code simplification.
pac-components
Sébastien Villemot 2021-12-06 12:53:35 +01:00
parent 607c5aab19
commit 7b8fc8edb7
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/DynamicModel.cc
View File

@ -5546,18 +5546,28 @@ DynamicModel::detrendEquations()
// We go backwards in the list of trend_vars, to deal correctly with I(2) processes
for (auto it = nonstationary_symbols_map.crbegin();
it != nonstationary_symbols_map.crend(); ++it)
for (auto &equation : equations)
{
auto substeq = dynamic_cast<BinaryOpNode *>(equation->detrend(it->first, it->second.first, it->second.second));
assert(substeq);
equation = dynamic_cast<BinaryOpNode *>(substeq);
}
{
for (auto &equation : equations)
{
equation = dynamic_cast<BinaryOpNode *>(equation->detrend(it->first, it->second.first, it->second.second));
assert(equation);
}
for (auto &equation : static_only_equations)
{
equation = dynamic_cast<BinaryOpNode *>(equation->detrend(it->first, it->second.first, it->second.second));
assert(equation);
}
}
for (auto &equation : equations)
{
auto substeq = dynamic_cast<BinaryOpNode *>(equation->removeTrendLeadLag(trend_symbols_map));
assert(substeq);
equation = dynamic_cast<BinaryOpNode *>(substeq);
equation = dynamic_cast<BinaryOpNode *>(equation->removeTrendLeadLag(trend_symbols_map));
assert(equation);
}
for (auto &equation : static_only_equations)
{
equation = dynamic_cast<BinaryOpNode *>(equation->removeTrendLeadLag(trend_symbols_map));
assert(equation);
}
}
@ -5566,9 +5576,13 @@ DynamicModel::removeTrendVariableFromEquations()
{
for (auto &equation : equations)
{
auto substeq = dynamic_cast<BinaryOpNode *>(equation->replaceTrendVar());
assert(substeq);
equation = dynamic_cast<BinaryOpNode *>(substeq);
equation = dynamic_cast<BinaryOpNode *>(equation->replaceTrendVar());
assert(equation);
}
for (auto &equation : static_only_equations)
{
equation = dynamic_cast<BinaryOpNode *>(equation->replaceTrendVar());
assert(equation);
}
}