From a01c811f5f885a925d1e6865751fef56f7dc82d9 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Thu, 9 Jan 2020 10:03:41 +0100 Subject: [PATCH] Square and cubic UDLs renamed --- src/include/units/physical/cgs/area.h | 6 +-- src/include/units/physical/si/acceleration.h | 6 +-- src/include/units/physical/si/area.h | 24 +++++------ src/include/units/physical/si/volume.h | 24 +++++------ src/include/units/physical/us/area.h | 6 +-- src/include/units/physical/us/volume.h | 6 +-- test/unit_test/runtime/fmt_units_test.cpp | 22 +++++----- test/unit_test/runtime/math_test.cpp | 6 +-- test/unit_test/static/cgs_test.cpp | 10 ++--- test/unit_test/static/math_test.cpp | 4 +- test/unit_test/static/quantity_test.cpp | 4 +- test/unit_test/static/si_cgs_test.cpp | 6 +-- test/unit_test/static/si_test.cpp | 44 ++++++++++---------- 13 files changed, 84 insertions(+), 84 deletions(-) diff --git a/src/include/units/physical/cgs/area.h b/src/include/units/physical/cgs/area.h index c9618a53..6facde0b 100644 --- a/src/include/units/physical/cgs/area.h +++ b/src/include/units/physical/cgs/area.h @@ -38,9 +38,9 @@ using area = quantity; inline namespace literals { -// sq_cm -constexpr auto operator"" sq_cm(unsigned long long l) { return area(l); } -constexpr auto operator"" sq_cm(long double l) { return area(l); } +// cm2 +constexpr auto operator"" cm2(unsigned long long l) { return area(l); } +constexpr auto operator"" cm2(long double l) { return area(l); } } diff --git a/src/include/units/physical/si/acceleration.h b/src/include/units/physical/si/acceleration.h index b7d34653..9bb311a3 100644 --- a/src/include/units/physical/si/acceleration.h +++ b/src/include/units/physical/si/acceleration.h @@ -36,9 +36,9 @@ using acceleration = quantity; inline namespace literals { -// mps_sq -constexpr auto operator""mps_sq(unsigned long long l) { return acceleration(l); } -constexpr auto operator""mps_sq(long double l) { return acceleration(l); } +// mps2 +constexpr auto operator""mps2(unsigned long long l) { return acceleration(l); } +constexpr auto operator""mps2(long double l) { return acceleration(l); } } // namespace literals diff --git a/src/include/units/physical/si/area.h b/src/include/units/physical/si/area.h index c62a4d6a..4a3f9199 100644 --- a/src/include/units/physical/si/area.h +++ b/src/include/units/physical/si/area.h @@ -42,21 +42,21 @@ using area = quantity; inline namespace literals { -// sq_m -constexpr auto operator"" sq_m(unsigned long long l) { return area(l); } -constexpr auto operator"" sq_m(long double l) { return area(l); } +// m2 +constexpr auto operator"" m2(unsigned long long l) { return area(l); } +constexpr auto operator"" m2(long double l) { return area(l); } -// sq_mm -constexpr auto operator"" sq_mm(unsigned long long l) { return area(l); } -constexpr auto operator"" sq_mm(long double l) { return area(l); } +// mm2 +constexpr auto operator"" mm2(unsigned long long l) { return area(l); } +constexpr auto operator"" mm2(long double l) { return area(l); } -// sq_cm -constexpr auto operator"" sq_cm(unsigned long long l) { return area(l); } -constexpr auto operator"" sq_cm(long double l) { return area(l); } +// cm2 +constexpr auto operator"" cm2(unsigned long long l) { return area(l); } +constexpr auto operator"" cm2(long double l) { return area(l); } -// sq_km -constexpr auto operator"" sq_km(unsigned long long l) { return area(l); } -constexpr auto operator"" sq_km(long double l) { return area(l); } +// km2 +constexpr auto operator"" km2(unsigned long long l) { return area(l); } +constexpr auto operator"" km2(long double l) { return area(l); } // ha constexpr auto operator"" ha(unsigned long long l) { return area(l); } diff --git a/src/include/units/physical/si/volume.h b/src/include/units/physical/si/volume.h index 9f220a26..7d71e0a9 100644 --- a/src/include/units/physical/si/volume.h +++ b/src/include/units/physical/si/volume.h @@ -43,21 +43,21 @@ using volume = quantity; inline namespace literals { -// cub_mm -constexpr auto operator""cub_mm(unsigned long long l) { return volume(l); } -constexpr auto operator""cub_mm(long double l) { return volume(l); } +// mm3 +constexpr auto operator""mm3(unsigned long long l) { return volume(l); } +constexpr auto operator""mm3(long double l) { return volume(l); } -// cub_cm -constexpr auto operator""cub_cm(unsigned long long l) { return volume(l); } -constexpr auto operator""cub_cm(long double l) { return volume(l); } +// cm3 +constexpr auto operator""cm3(unsigned long long l) { return volume(l); } +constexpr auto operator""cm3(long double l) { return volume(l); } -// cub_m -constexpr auto operator""cub_m(unsigned long long l) { return volume(l); } -constexpr auto operator""cub_m(long double l) { return volume(l); } +// m3 +constexpr auto operator""m3(unsigned long long l) { return volume(l); } +constexpr auto operator""m3(long double l) { return volume(l); } -// cub_km -constexpr auto operator""cub_km(unsigned long long l) { return volume(l); } -constexpr auto operator""cub_km(long double l) { return volume(l); } +// km3 +constexpr auto operator""km3(unsigned long long l) { return volume(l); } +constexpr auto operator""km3(long double l) { return volume(l); } // l constexpr auto operator""_l(unsigned long long l) { return volume(l); } diff --git a/src/include/units/physical/us/area.h b/src/include/units/physical/us/area.h index 0d723af3..9dad9d4f 100644 --- a/src/include/units/physical/us/area.h +++ b/src/include/units/physical/us/area.h @@ -31,9 +31,9 @@ struct square_foot : deduced_unit {}; inline namespace literals { -// sq_ft -constexpr auto operator"" sq_ft(unsigned long long l) { return si::area(l); } -constexpr auto operator"" sq_ft(long double l) { return si::area(l); } +// ft2 +constexpr auto operator"" ft2(unsigned long long l) { return si::area(l); } +constexpr auto operator"" ft2(long double l) { return si::area(l); } } // namespace literals diff --git a/src/include/units/physical/us/volume.h b/src/include/units/physical/us/volume.h index 29898cc5..c01e51d5 100644 --- a/src/include/units/physical/us/volume.h +++ b/src/include/units/physical/us/volume.h @@ -31,9 +31,9 @@ struct cubic_foot : deduced_unit {}; inline namespace literals { -// cub_ft -constexpr auto operator""cub_ft(unsigned long long l) { return si::volume(l); } -constexpr auto operator""cub_ft(long double l) { return si::volume(l); } +// ft3 +constexpr auto operator""ft3(unsigned long long l) { return si::volume(l); } +constexpr auto operator""ft3(long double l) { return si::volume(l); } } // namespace literals diff --git a/test/unit_test/runtime/fmt_units_test.cpp b/test/unit_test/runtime/fmt_units_test.cpp index 72fb7a24..a1a8f3cd 100644 --- a/test/unit_test/runtime/fmt_units_test.cpp +++ b/test/unit_test/runtime/fmt_units_test.cpp @@ -58,20 +58,20 @@ TEST_CASE("fmt::format on synthesized unit symbols", "[text][fmt]") SECTION("area") { - CHECK(fmt::format("{}", 1sq_m) == "1 m²"); - CHECK(fmt::format("{}", 1sq_mm) == "1 mm²"); - CHECK(fmt::format("{}", 1sq_cm) == "1 cm²"); - CHECK(fmt::format("{}", 1sq_km) == "1 km²"); - CHECK(fmt::format("{}", 1sq_ft) == "1 ft²"); + CHECK(fmt::format("{}", 1m2) == "1 m²"); + CHECK(fmt::format("{}", 1mm2) == "1 mm²"); + CHECK(fmt::format("{}", 1cm2) == "1 cm²"); + CHECK(fmt::format("{}", 1km2) == "1 km²"); + CHECK(fmt::format("{}", 1ft2) == "1 ft²"); } SECTION("volume") { - CHECK(fmt::format("{}", 1cub_m) == "1 m³"); - CHECK(fmt::format("{}", 1cub_mm) == "1 mm³"); - CHECK(fmt::format("{}", 1cub_cm) == "1 cm³"); - CHECK(fmt::format("{}", 1cub_km) == "1 km³"); - CHECK(fmt::format("{}", 1cub_ft) == "1 ft³"); + CHECK(fmt::format("{}", 1m3) == "1 m³"); + CHECK(fmt::format("{}", 1mm3) == "1 mm³"); + CHECK(fmt::format("{}", 1cm3) == "1 cm³"); + CHECK(fmt::format("{}", 1km3) == "1 km³"); + CHECK(fmt::format("{}", 1ft3) == "1 ft³"); } SECTION("frequency") @@ -92,7 +92,7 @@ TEST_CASE("fmt::format on synthesized unit symbols", "[text][fmt]") SECTION("acceleration") { - CHECK(fmt::format("{}", 1mps_sq) == "1 m/s²"); + CHECK(fmt::format("{}", 1mps2) == "1 m/s²"); } SECTION("energy") diff --git a/test/unit_test/runtime/math_test.cpp b/test/unit_test/runtime/math_test.cpp index b147e839..dc0e6442 100644 --- a/test/unit_test/runtime/math_test.cpp +++ b/test/unit_test/runtime/math_test.cpp @@ -41,15 +41,15 @@ TEST_CASE("'pow()' on quantity changes the value and the dimension accordingl } SECTION ("'pow<2>(q)' squares both the value and a dimension") { - CHECK(pow<2>(2m) == 4sq_m); + CHECK(pow<2>(2m) == 4m2); } SECTION ("'pow<3>(q)' cubes both the value and a dimension") { - CHECK(pow<3>(2m) == 8cub_m); + CHECK(pow<3>(2m) == 8m3); } } TEST_CASE("'sqrt()' on quantity changes the value and the dimension accordingly", "[math][sqrt]") { - REQUIRE(sqrt(4sq_m) == 2m); + REQUIRE(sqrt(4m2) == 2m); } diff --git a/test/unit_test/static/cgs_test.cpp b/test/unit_test/static/cgs_test.cpp index e58bb4d4..dbf8a779 100644 --- a/test/unit_test/static/cgs_test.cpp +++ b/test/unit_test/static/cgs_test.cpp @@ -59,8 +59,8 @@ static_assert(detail::unit_text() == "cm/s" // area static_assert(std::is_same_v::ratio>, ratio<1>>); -static_assert(1cm * 1cm == 1sq_cm); -static_assert(100sq_cm / 10cm == 10cm); +static_assert(1cm * 1cm == 1cm2); +static_assert(100cm2 / 10cm == 10cm); static_assert(detail::unit_text() == "cm²"); @@ -80,9 +80,9 @@ static_assert(100dyn / 10Gal == 10g); // pressure -static_assert(10dyn / 10sq_cm == 1Ba); -static_assert(10dyn / 1Ba == 10sq_cm); -static_assert(1Ba * 10sq_cm == 10dyn); +static_assert(10dyn / 10cm2 == 1Ba); +static_assert(10dyn / 1Ba == 10cm2); +static_assert(1Ba * 10cm2 == 10dyn); // energy diff --git a/test/unit_test/static/math_test.cpp b/test/unit_test/static/math_test.cpp index 752c58b7..b320abc6 100644 --- a/test/unit_test/static/math_test.cpp +++ b/test/unit_test/static/math_test.cpp @@ -29,7 +29,7 @@ namespace { static_assert(std::is_same_v(2m)), std::int64_t>); static_assert(std::is_same_v(2m)), decltype(2m)>); - static_assert(std::is_same_v(2m)), decltype(4sq_m)>); - static_assert(std::is_same_v); + static_assert(std::is_same_v(2m)), decltype(4m2)>); + static_assert(std::is_same_v); } // namespace diff --git a/test/unit_test/static/quantity_test.cpp b/test/unit_test/static/quantity_test.cpp index 12a2706a..9fb129ce 100644 --- a/test/unit_test/static/quantity_test.cpp +++ b/test/unit_test/static/quantity_test.cpp @@ -270,7 +270,7 @@ static_assert((7m % 2).count() == 1); static_assert((7m % 2m).count() == 1); static_assert((7km % 2000m).count() == 1000); -static_assert((10sq_km * 10sq_km) / 50sq_km == 2sq_km); +static_assert((10km2 * 10km2) / 50km2 == 2km2); // comparators @@ -346,6 +346,6 @@ static_assert(1km / 1s == 1000mps); static_assert(2kmph * 2h == 4km); static_assert(2km / 2kmph == 1h); -static_assert(std::is_same_v(2m)), decltype(4sq_m)>); +static_assert(std::is_same_v(2m)), decltype(4m2)>); } // namespace diff --git a/test/unit_test/static/si_cgs_test.cpp b/test/unit_test/static/si_cgs_test.cpp index 78605221..cbc03194 100644 --- a/test/unit_test/static/si_cgs_test.cpp +++ b/test/unit_test/static/si_cgs_test.cpp @@ -65,7 +65,7 @@ static_assert(cgs::length(100) == 1m); static_assert(cgs::mass(1'000) == 1kg); static_assert(cgs::time(1) == 1s); static_assert(cgs::velocity(100) == 1mps); -static_assert(cgs::acceleration(100) == 1mps_sq); +static_assert(cgs::acceleration(100) == 1mps2); static_assert(cgs::force(100'000) == 1N); static_assert(cgs::energy(10'000'000) == 1_J); static_assert(cgs::power(10'000'000) == 1W); @@ -98,7 +98,7 @@ using namespace units::cgs::literals; // static_assert(1'000g == 1kg); // ambiguous static_assert(1s == 1s); static_assert(100cmps == 1mps); -static_assert(100Gal == 1mps_sq); +static_assert(100Gal == 1mps2); static_assert(100'000dyn == 1N); static_assert(10'000'000_erg == 1_J); static_assert(10'000'000_ergps == 1W); @@ -131,7 +131,7 @@ static_assert(quantity_cast>(si::length( // static_assert(200cm * si::length(2) == si::area(4)); // should not compile (unknown dimension) static_assert(quantity_cast(200cm) * si::length(2) == si::area(4)); -static_assert(200cm * quantity_cast(si::length(2)) == 40'000sq_cm); +static_assert(200cm * quantity_cast(si::length(2)) == 40'000cm2); // TODO Add support for quantity_cast on an unknown_dimension? // static_assert(quantity_cast>(200cm * si::length(2)) == si::area(4)); diff --git a/test/unit_test/static/si_test.cpp b/test/unit_test/static/si_test.cpp index 62d7ab3d..80a02362 100644 --- a/test/unit_test/static/si_test.cpp +++ b/test/unit_test/static/si_test.cpp @@ -122,15 +122,15 @@ static_assert(10Hz * 1min == 600); static_assert(2 / 1Hz == 2s); // force -static_assert(10kg * 10mps_sq == 100N); -static_assert(100N / 1mps_sq == 100kg); -static_assert(100N / 1kg == 100mps_sq); +static_assert(10kg * 10mps2 == 100N); +static_assert(100N / 1mps2 == 100kg); +static_assert(100N / 1kg == 100mps2); // pressure -static_assert(10N / 10sq_m == 1Pa); -static_assert(10N / 1Pa == 10sq_m); -static_assert(1Pa * 10sq_m == 10N); +static_assert(10N / 10m2 == 1Pa); +static_assert(10N / 1Pa == 10m2); +static_assert(1Pa * 10m2 == 10N); // energy @@ -147,9 +147,9 @@ static_assert(gigajoule::symbol == "GJ"); static_assert(10N * 10m == 100_J); static_assert(100_J / 10m == 10N); static_assert(100_J / 10N == 10m); -static_assert(10Pa * 10cub_m == 100_J); -static_assert(100_J / 10Pa == 10cub_m); -static_assert(100_J / 10cub_m == 10Pa); +static_assert(10Pa * 10m3 == 100_J); +static_assert(100_J / 10Pa == 10m3); +static_assert(100_J / 10m3 == 10Pa); // power @@ -215,30 +215,30 @@ static_assert(kilometre_per_hour::symbol == "km/h"); // acceleration -static_assert(10mps / 10s == 1mps_sq); -static_assert(10mps / 1mps_sq == 10s); -static_assert(1mps_sq * 10s == 10mps); +static_assert(10mps / 10s == 1mps2); +static_assert(10mps / 1mps2 == 10s); +static_assert(1mps2 * 10s == 10mps); static_assert(detail::unit_text() == "m/s²"); // area -static_assert(10m * 10m == 100sq_m); -static_assert(100sq_m / 10m == 10m); -static_assert(10km * 10km == 100sq_km); -static_assert(1sq_m == 10'000sq_cm); -static_assert(1ha == 10'000sq_m); +static_assert(10m * 10m == 100m2); +static_assert(100m2 / 10m == 10m); +static_assert(10km * 10km == 100km2); +static_assert(1m2 == 10'000cm2); +static_assert(1ha == 10'000m2); static_assert(detail::unit_text() == "m²"); // volume -static_assert(1m * 1m * 1m == 1cub_m); -static_assert(10sq_m * 10m == 100cub_m); -static_assert(10km * 10km * 10km == 1000cub_km); -static_assert(1cub_m == 1'000'000cub_cm); +static_assert(1m * 1m * 1m == 1m3); +static_assert(10m2 * 10m == 100m3); +static_assert(10km * 10km * 10km == 1000km3); +static_assert(1m3 == 1'000'000cm3); static_assert(1dm * 1dm * 1dm == 1_l); -static_assert(1000_l == 1cub_m); +static_assert(1000_l == 1m3); static_assert(detail::unit_text() == "m³");