From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Wed, 29 May 2024 16:29:55 -0700 Subject: [PATCH 1/8] Use fmtlib --- include/.styleguide | 1 + include/sleipnir/util/print.hpp | 31 ++++++++++++++++++------------- src/optimization/problem.cpp | 2 +- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/include/.styleguide b/include/.styleguide index 1b6652d3d5886cf8c9eca0d855c21031775bad7c..4f4c76204071f90bf49eddb8c2aceb583b5e09ba 100644 --- a/include/.styleguide +++ b/include/.styleguide @@ -8,5 +8,6 @@ cppSrcFileInclude { includeOtherLibs { ^Eigen/ + ^fmt/ ^gch/ } diff --git a/include/sleipnir/util/print.hpp b/include/sleipnir/util/print.hpp index fe430352dabf4cd6a890dc8007237c7a261dfd4b..055d5c9fa246201f1d8ae7ddca00b1159aeb2a57 100644 --- a/include/sleipnir/util/print.hpp +++ b/include/sleipnir/util/print.hpp @@ -4,10 +4,15 @@ #ifndef SLEIPNIR_DISABLE_DIAGNOSTICS #include -#include #include #include +#if __has_include() +#include +#else +#include +#endif + #endif namespace slp { @@ -15,45 +20,45 @@ namespace slp { #ifndef SLEIPNIR_DISABLE_DIAGNOSTICS /** - * Wrapper around std::print() that squelches write failure exceptions. + * Wrapper around fmt::print() that squelches write failure exceptions. */ template -inline void print(std::format_string fmt, T&&... args) { +inline void print(fmt::format_string fmt, T&&... args) { try { - std::print(fmt, std::forward(args)...); + fmt::print(fmt, std::forward(args)...); } catch (const std::system_error&) { } } /** - * Wrapper around std::print() that squelches write failure exceptions. + * Wrapper around fmt::print() that squelches write failure exceptions. */ template -inline void print(std::FILE* f, std::format_string fmt, T&&... args) { +inline void print(std::FILE* f, fmt::format_string fmt, T&&... args) { try { - std::print(f, fmt, std::forward(args)...); + fmt::print(f, fmt, std::forward(args)...); } catch (const std::system_error&) { } } /** - * Wrapper around std::println() that squelches write failure exceptions. + * Wrapper around fmt::println() that squelches write failure exceptions. */ template -inline void println(std::format_string fmt, T&&... args) { +inline void println(fmt::format_string fmt, T&&... args) { try { - std::println(fmt, std::forward(args)...); + fmt::println(fmt, std::forward(args)...); } catch (const std::system_error&) { } } /** - * Wrapper around std::println() that squelches write failure exceptions. + * Wrapper around fmt::println() that squelches write failure exceptions. */ template -inline void println(std::FILE* f, std::format_string fmt, T&&... args) { +inline void println(std::FILE* f, fmt::format_string fmt, T&&... args) { try { - std::println(f, fmt, std::forward(args)...); + fmt::println(f, fmt, std::forward(args)...); } catch (const std::system_error&) { } } diff --git a/src/optimization/problem.cpp b/src/optimization/problem.cpp index 31115490867146ec166604bcc61731d7891a9f22..81863808d329a53d4162ce0624a3b8e8afc32dfc 100644 --- a/src/optimization/problem.cpp +++ b/src/optimization/problem.cpp @@ -335,7 +335,7 @@ void Problem::print_exit_conditions([[maybe_unused]] const Options& options) { slp::println(" ↳ executed {} iterations", options.max_iterations); } if (std::isfinite(options.timeout.count())) { - slp::println(" ↳ {} elapsed", options.timeout); + slp::println(" ↳ {} elapsed", options.timeout.count()); } }