From 4f2961690659c373a94ffd3d2864fa406780e0ef Mon Sep 17 00:00:00 2001 From: Philip Top Date: Thu, 24 Mar 2022 17:50:30 -0700 Subject: [PATCH] fix some mismatched power test units --- units/units.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/units/units.cpp b/units/units.cpp index ed2319f2..00246a82 100644 --- a/units/units.cpp +++ b/units/units.cpp @@ -159,7 +159,7 @@ static const umap base_unit_names = getDefinedBaseUnitNames(); using ustr = std::pair; // units to divide into tests to explore common multiplier units -static UNITS_CPP14_CONSTEXPR_OBJECT std::array testUnits{ +static UNITS_CPP14_CONSTEXPR_OBJECT std::array testUnits{ {ustr{precise::m, "m"}, ustr{precise::s, "s"}, ustr{precise::ms, "ms"}, @@ -168,6 +168,7 @@ static UNITS_CPP14_CONSTEXPR_OBJECT std::array testUnits{ ustr{precise::time::day, "day"}, ustr{precise::lb, "lb"}, ustr{precise::ft, "ft"}, + ustr{precise::mile, "mi"}, ustr{constants::c.as_unit(), "[c]"}, ustr{constants::h.as_unit(), "[h]"}, ustr{precise::L, "L"}, @@ -179,6 +180,7 @@ static UNITS_CPP14_CONSTEXPR_OBJECT std::array testUnits{ ustr{precise::electrical::kW, "kW"}, ustr{precise::electrical::mW, "mW"}, ustr{precise::MW, "MW"}, + ustr{precise::giga*precise::W, "GW"}, ustr{precise::energy::eV, "eV"}, ustr{precise::count, "item"}}}; @@ -186,9 +188,9 @@ static UNITS_CPP14_CONSTEXPR_OBJECT std::array testUnits{ // multiplied by power static UNITS_CPP14_CONSTEXPR_OBJECT std::array testPowerUnits{ {ustr{precise::m, "m"}, - ustr{precise::m, "km"}, + ustr{precise::km, "km"}, ustr{precise::s, "s"}, - ustr{precise::ms, "ft"}, + ustr{precise::ft, "ft"}, ustr{precise::mile, "mi"}}}; // units to divide into tests to explore common multiplier units