From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Sat, 8 Feb 2025 13:42:36 -0800 Subject: [PATCH 05/10] Replace std::views::zip() --- include/sleipnir/autodiff/gradient_expression_graph.hpp | 5 ++++- include/sleipnir/optimization/problem.hpp | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/sleipnir/autodiff/gradient_expression_graph.hpp b/include/sleipnir/autodiff/gradient_expression_graph.hpp index fda7931c686a315209acdbe6f1ac581944e2781c..d3e59068d04b3db01945c5657959b69cd4522cca 100644 --- a/include/sleipnir/autodiff/gradient_expression_graph.hpp +++ b/include/sleipnir/autodiff/gradient_expression_graph.hpp @@ -139,7 +139,10 @@ class GradientExpressionGraph { } } - for (const auto& [col, node] : std::views::zip(m_col_list, m_top_list)) { + for (size_t i = 0; i < m_top_list.size(); ++i) { + const auto& col = m_col_list[i]; + const auto& node = m_top_list[i]; + // Append adjoints of wrt to sparse matrix triplets if (col != -1) { triplets.emplace_back(row, col, node->adjoint); diff --git a/include/sleipnir/optimization/problem.hpp b/include/sleipnir/optimization/problem.hpp index 49921b98de3452b6ca9f2e33a86daa254c0d3a01..d3feadd577bd53147a8b07da76910e046ccbf95d 100644 --- a/include/sleipnir/optimization/problem.hpp +++ b/include/sleipnir/optimization/problem.hpp @@ -792,9 +792,11 @@ class Problem { for (const auto& constraint : constraints) { ++counts[slp::to_underlying(constraint.type())]; } - for (const auto& [count, name] : - std::views::zip(counts, std::array{"empty", "constant", "linear", - "quadratic", "nonlinear"})) { + for (size_t i = 0; i < counts.size(); ++i) { + constexpr std::array names{"empty", "constant", "linear", + "quadratic", "nonlinear"}; + const auto& count = counts[i]; + const auto& name = names[i]; if (count > 0) { slp::println(" ↳ {} {}", count, name); }