diff --git a/docs/reference/systems/generic/angle.rst b/docs/reference/systems/generic/angle.rst index bce4e508..b780a15b 100644 --- a/docs/reference/systems/generic/angle.rst +++ b/docs/reference/systems/generic/angle.rst @@ -2,7 +2,7 @@ Angle ===== .. doxygenstruct:: units::radian -.. doxygenstruct:: units::rotation +.. doxygenstruct:: units::revolution .. doxygenstruct:: units::degree .. doxygenstruct:: units::gradian diff --git a/example/aliases/experimental_angle.cpp b/example/aliases/experimental_angle.cpp index d58e1938..95c2520f 100644 --- a/example/aliases/experimental_angle.cpp +++ b/example/aliases/experimental_angle.cpp @@ -38,7 +38,7 @@ int main() Angle auto angle = energy / torque; std::cout << angle << '\n'; - std::cout << quantity_cast(angle) << '\n'; + std::cout << quantity_cast(angle) << '\n'; std::cout << quantity_cast(angle) << '\n'; std::cout << quantity_cast(angle) << '\n'; } diff --git a/example/literals/experimental_angle.cpp b/example/literals/experimental_angle.cpp index e91e7868..0dce9c7d 100644 --- a/example/literals/experimental_angle.cpp +++ b/example/literals/experimental_angle.cpp @@ -38,7 +38,7 @@ int main() Angle auto angle = energy / torque; std::cout << angle << '\n'; - std::cout << quantity_cast(angle) << '\n'; + std::cout << quantity_cast(angle) << '\n'; std::cout << quantity_cast(angle) << '\n'; std::cout << quantity_cast(angle) << '\n'; } diff --git a/example/references/experimental_angle.cpp b/example/references/experimental_angle.cpp index ba9d25cd..e619f401 100644 --- a/example/references/experimental_angle.cpp +++ b/example/references/experimental_angle.cpp @@ -47,7 +47,7 @@ int main() Angle auto angle = energy / torque; std::cout << angle << '\n'; - std::cout << quantity_cast(angle) << '\n'; + std::cout << quantity_cast(angle) << '\n'; std::cout << quantity_cast(angle) << '\n'; std::cout << quantity_cast(angle) << '\n'; } diff --git a/src/core/include/units/generic/angle.h b/src/core/include/units/generic/angle.h index 80532735..b806ce4e 100644 --- a/src/core/include/units/generic/angle.h +++ b/src/core/include/units/generic/angle.h @@ -33,9 +33,9 @@ namespace units { struct radian : named_unit {}; -struct rotation : named_scaled_unit() * mag_pi, radian> {}; -struct degree : named_scaled_unit(), rotation> {}; -struct gradian : named_scaled_unit(), rotation> {}; +struct revolution : named_scaled_unit() * mag_pi, radian> {}; +struct degree : named_scaled_unit(), revolution> {}; +struct gradian : named_scaled_unit(), revolution> {}; template struct dim_angle : base_dimension<"A", U> {}; @@ -62,12 +62,12 @@ constexpr auto operator"" _q_rad(unsigned long long l) constexpr auto operator"" _q_rad(long double l) { return angle(l); } // rot -constexpr auto operator"" _q_rot(unsigned long long l) +constexpr auto operator"" _q_rev(unsigned long long l) { gsl_ExpectsAudit(std::in_range(l)); - return angle(static_cast(l)); + return angle(static_cast(l)); } -constexpr auto operator"" _q_rot(long double l) { return angle(l); } +constexpr auto operator"" _q_rev(long double l) { return angle(l); } // deg constexpr auto operator"" _q_deg(unsigned long long l) @@ -94,7 +94,7 @@ constexpr auto operator"" _q_grad(long double l) { return angle, radian>{}; -inline constexpr auto rot = reference, rotation>{}; +inline constexpr auto rev = reference, revolution>{}; inline constexpr auto deg = reference, degree>{}; inline constexpr auto grad = reference, gradian>{}; @@ -117,7 +117,7 @@ namespace units::aliases::inline angle { template using rad = units::angle; template -using rot = units::angle; +using rev = units::angle; template using deg = units::angle; template diff --git a/test/unit_test/static/angle_test.cpp b/test/unit_test/static/angle_test.cpp index 4abc679e..d9ca9fd2 100644 --- a/test/unit_test/static/angle_test.cpp +++ b/test/unit_test/static/angle_test.cpp @@ -31,18 +31,18 @@ namespace { using namespace units::references; using namespace units::literals; -static_assert(360 * deg == 1 * rot); -static_assert(400 * grad == 1 * rot); -static_assert(std::numbers::pi * 2 * rad == 1. * rot); +static_assert(360 * deg == 1 * rev); +static_assert(400 * grad == 1 * rev); +static_assert(std::numbers::pi * 2 * rad == 1. * rev); -static_assert(360_q_deg == 1_q_rot); -static_assert(400_q_grad == 1_q_rot); -static_assert(std::numbers::pi * quantity_cast(2._q_rad) == quantity_cast(1._q_rot)); +static_assert(360_q_deg == 1_q_rev); +static_assert(400_q_grad == 1_q_rev); +static_assert(std::numbers::pi * quantity_cast(2._q_rad) == quantity_cast(1._q_rev)); -static_assert(units::aliases::deg<>(360.) == units::aliases::rot<>(1.)); -static_assert(units::aliases::deg(360) == units::aliases::rot(1)); -static_assert(units::aliases::grad(400) == units::aliases::rot(1)); -static_assert(std::numbers::pi * units::aliases::rad<>(2.) == units::aliases::rot<>(1.)); +static_assert(units::aliases::deg<>(360.) == units::aliases::rev<>(1.)); +static_assert(units::aliases::deg(360) == units::aliases::rev(1)); +static_assert(units::aliases::grad(400) == units::aliases::rev(1)); +static_assert(std::numbers::pi * units::aliases::rad<>(2.) == units::aliases::rev<>(1.)); // solid angle