From 3fec11b183ee8b2d6fc1db8ab402d59736939456 Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtan@dynare.org>
Date: Thu, 30 Jan 2020 12:47:59 +0100
Subject: [PATCH] code simplifications
---
src/DynamicModel.cc | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/DynamicModel.cc b/src/DynamicModel.cc
index 1b38a87d..a84bb6f1 100644
--- a/src/DynamicModel.cc
+++ b/src/DynamicModel.cc
@@ -6720,8 +6720,7 @@ DynamicModel::fillEvalContext(eval_context_t &eval_context) const
}
//Third, trend variables
- vector <int> trendVars = symbol_table.getTrendVarIds();
- for (int &trendVar : trendVars)
+ for (int trendVar : symbol_table.getTrendVarIds())
eval_context[trendVar] = 2; //not <= 0 bc of log, not 1 bc of powers
}
@@ -6729,13 +6728,9 @@ bool
DynamicModel::isModelLocalVariableUsed() const
{
set<int> used_local_vars;
- size_t i = 0;
- while (i < equations.size() && used_local_vars.size() == 0)
- {
- equations[i]->collectVariables(SymbolType::modelLocalVariable, used_local_vars);
- i++;
- }
- return used_local_vars.size() > 0;
+ for (size_t i = 0; i < equations.size() && used_local_vars.empty(); i++)
+ equations[i]->collectVariables(SymbolType::modelLocalVariable, used_local_vars);
+ return !used_local_vars.empty();
}
void
--
GitLab