From ae83974e0ed7f228b0bc4a6dabea85810dcbda28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Tue, 28 Feb 2023 15:33:33 +0100
Subject: [PATCH] Minor simplification using if with initialization

---
 src/DynamicModel.cc | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/DynamicModel.cc b/src/DynamicModel.cc
index e6cfa82d..62230e78 100644
--- a/src/DynamicModel.cc
+++ b/src/DynamicModel.cc
@@ -2109,13 +2109,11 @@ DynamicModel::computingPass(int derivsOrder, int paramsDerivsOrder, const eval_c
 
   // Compute derivatives w.r. to all endogenous, exogenous and exogenous deterministic
   set<int> vars;
-  for (auto &it : deriv_id_table)
-    {
-      SymbolType type = symbol_table.getType(it.first.first);
-      if (type == SymbolType::endogenous || type == SymbolType::exogenous
-          || type == SymbolType::exogenousDet)
-        vars.insert(it.second);
-    }
+  for (auto &[symb_lag, deriv_id] : deriv_id_table)
+    if (SymbolType type = symbol_table.getType(symb_lag.first);
+        type == SymbolType::endogenous || type == SymbolType::exogenous
+        || type == SymbolType::exogenousDet)
+      vars.insert(deriv_id);
 
   // Launch computations
   cout << "Computing " << modelClassName() << " derivatives (order " << derivsOrder << ")." << endl;
-- 
GitLab