From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Tue, 28 Jan 2025 22:19:31 -0800 Subject: [PATCH 4/9] Replace std::to_underlying() --- include/sleipnir/optimization/problem.hpp | 8 ++++---- include/sleipnir/util/print_diagnostics.hpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/sleipnir/optimization/problem.hpp b/include/sleipnir/optimization/problem.hpp index ba45ead1500b45616b74e1d108959127484cf4d6..22e7cdaa945648e2b9effcc30533d6602c839c22 100644 --- a/include/sleipnir/optimization/problem.hpp +++ b/include/sleipnir/optimization/problem.hpp @@ -657,11 +657,11 @@ class Problem { // Print problem structure slp::println("\nProblem structure:"); slp::println(" ↳ {} cost function", - types[std::to_underlying(cost_function_type())]); + types[static_cast(cost_function_type())]); slp::println(" ↳ {} equality constraints", - types[std::to_underlying(equality_constraint_type())]); + types[static_cast(equality_constraint_type())]); slp::println(" ↳ {} inequality constraints", - types[std::to_underlying(inequality_constraint_type())]); + types[static_cast(inequality_constraint_type())]); if (m_decision_variables.size() == 1) { slp::print("\n1 decision variable\n"); @@ -673,7 +673,7 @@ class Problem { [](const gch::small_vector>& constraints) { std::array counts{}; for (const auto& constraint : constraints) { - ++counts[std::to_underlying(constraint.type())]; + ++counts[static_cast(constraint.type())]; } for (const auto& [count, name] : std::views::zip(counts, std::array{"empty", "constant", "linear", diff --git a/include/sleipnir/util/print_diagnostics.hpp b/include/sleipnir/util/print_diagnostics.hpp index 54277542c46e9490a9ef01c43dc8572e9367c97e..c50d7e171bc90ea47108de90471e7d778885f6af 100644 --- a/include/sleipnir/util/print_diagnostics.hpp +++ b/include/sleipnir/util/print_diagnostics.hpp @@ -238,9 +238,9 @@ void print_iteration_diagnostics(int iterations, IterationType type, slp::println( "│{:4} {:4} {:9.3f} {:12e} {:13e} {:12e} {:12e} {:.2e} {:<5} {:.2e} " "{:.2e} {:2d}│", - iterations, ITERATION_TYPES[std::to_underlying(type)], to_ms(time), error, - cost, infeasibility, complementarity, μ, power_of_10(δ), primal_α, dual_α, - backtracks); + iterations, ITERATION_TYPES[static_cast(type)], to_ms(time), + error, cost, infeasibility, complementarity, μ, power_of_10(δ), primal_α, + dual_α, backtracks); } #else #define print_iteration_diagnostics(...)