From c8929e4f898a68a60fd4c741fdbe5f977064f981 Mon Sep 17 00:00:00 2001 From: saundersp Date: Thu, 3 Aug 2023 21:32:29 +0200 Subject: [PATCH] cpp : fixed format_time_ns microsecond abbreviation --- cpp/toolbox.cpp | 2 +- cpp/toolbox_unit_test.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cpp/toolbox.cpp b/cpp/toolbox.cpp index ebdf470..15f7d28 100644 --- a/cpp/toolbox.cpp +++ b/cpp/toolbox.cpp @@ -5,7 +5,7 @@ static constexpr uint64_t u64(const double& n) noexcept { return static_cast(n); } static const constexpr size_t N_TIMES = 11; -static const constexpr std::array time_formats = { "ns", "us", "ms", "s", "m", "h", "j", "w", "M", "y", "c" }; +static const constexpr std::array time_formats = { "ns", "µs", "ms", "s", "m", "h", "j", "w", "M", "y", "c" }; static const constexpr std::array time_numbers = { 1, u64(1e3), u64(1e6), u64(1e9), u64(6e10), u64(36e11), u64(864e11), u64(6048e11), u64(26784e11), u64(31536e12), u64(31536e14) }; diff --git a/cpp/toolbox_unit_test.cpp b/cpp/toolbox_unit_test.cpp index e9c6b48..df35f81 100644 --- a/cpp/toolbox_unit_test.cpp +++ b/cpp/toolbox_unit_test.cpp @@ -85,7 +85,7 @@ void format_time_ns_test(void) noexcept { Assert("format_time_ns null", std::string("0ns"), format_time_ns(static_cast(0))); Assert("format_time_ns nanosecond", std::string("1ns"), format_time_ns(static_cast(1))); Assert("format_time_ns shake", std::string("10ns"), format_time_ns(static_cast(10))); - Assert("format_time_ns microsecond", std::string("1us"), format_time_ns(static_cast(1e3))); + Assert("format_time_ns microsecond", std::string("1µs"), format_time_ns(static_cast(1e3))); Assert("format_time_ns millisecond", std::string("1ms"), format_time_ns(static_cast(1e6))); Assert("format_time_ns centisecond", std::string("10ms"), format_time_ns(static_cast(1e7))); Assert("format_time_ns decisecond", std::string("100ms"), format_time_ns(static_cast(1e8))); @@ -112,7 +112,7 @@ void format_time_ns_test(void) noexcept { Assert("format_time_ns year", std::string("1y"), format_time_ns(static_cast(31536e12))); Assert("format_time_ns tropical year", std::string("1y 5h 48m 45s 216ms"), format_time_ns(static_cast(31556925216e6))); Assert("format_time_ns gregorian year", std::string("1y 5h 49m 12s"), format_time_ns(static_cast(31556952e9))); - Assert("format_time_ns sidereal year", std::string("1y 6h 9m 9s 763ms 545us 600ns"), format_time_ns(static_cast(315581497635456e2))); + Assert("format_time_ns sidereal year", std::string("1y 6h 9m 9s 763ms 545µs 600ns"), format_time_ns(static_cast(315581497635456e2))); Assert("format_time_ns leap year", std::string("1y 1j"), format_time_ns(static_cast(316224e11))); Assert("format_time_ns olympiad", std::string("4y"), format_time_ns(static_cast(126144e12))); Assert("format_time_ns lusturm", std::string("5y"), format_time_ns(static_cast(15768e13))); @@ -137,7 +137,7 @@ void format_time_ns_test(void) noexcept { //Assert("format_time_ns ronnasecond", std::string(""), format_time_ns(static_cast(1e36))); //Assert("format_time_ns quettasecond", std::string(""), format_time_ns(static_cast(1e39))); // uint64_t_MAX == 2**64 == 18446744073709551615I64u == -1 - Assert("format_time_ns max", std::string("5c 84y 11M 2j 23h 34m 33s 709ms 551us 615ns"), format_time_ns(static_cast(-1))); + Assert("format_time_ns max", std::string("5c 84y 11M 2j 23h 34m 33s 709ms 551µs 615ns"), format_time_ns(static_cast(-1))); } void thousand_sep_test(void) noexcept {