diff --git a/docs/examples.rst b/docs/examples.rst index ee75bc5c..a508a1f6 100644 --- a/docs/examples.rst +++ b/docs/examples.rst @@ -17,5 +17,6 @@ Examples examples/capacitor_time_curve examples/clcpp_response examples/conversion_factor + examples/experimental_angle examples/kalman_filter-alpha_beta_filter_example2 examples/total_energy diff --git a/docs/examples/experimental_angle.rst b/docs/examples/experimental_angle.rst new file mode 100644 index 00000000..46a970e9 --- /dev/null +++ b/docs/examples/experimental_angle.rst @@ -0,0 +1,7 @@ +experimental_angle +================== + +.. literalinclude:: ../../example/references/experimental_angle.cpp + :caption: experimental_angle.cpp + :start-at: #include + :linenos: diff --git a/example/literals/experimental_angle.cpp b/example/literals/experimental_angle.cpp index 4a4d0468..b05fed4e 100644 --- a/example/literals/experimental_angle.cpp +++ b/example/literals/experimental_angle.cpp @@ -22,21 +22,17 @@ #include #include -#include -#include #include #include - #include int main() { - using namespace units::literals; using namespace units::isq; using namespace units::isq::si::literals; - Torque auto torque = 20.0_q_Nm_per_rad; - Energy auto energy = 20.0_q_J; + const auto torque = 20.0_q_N_m_per_rad; + const auto energy = 20.0_q_J; units::Angle auto angle = energy / torque; diff --git a/src/systems/si/include/units/isq/si/torque.h b/src/systems/si/include/units/isq/si/torque.h index d960be90..e6631130 100644 --- a/src/systems/si/include/units/isq/si/torque.h +++ b/src/systems/si/include/units/isq/si/torque.h @@ -47,8 +47,8 @@ using torque = quantity; inline namespace literals { // Nm -constexpr auto operator"" _q_Nm_per_rad(unsigned long long l) { gsl_ExpectsAudit(std::in_range(l)); return torque(static_cast(l)); } -constexpr auto operator"" _q_Nm_per_rad(long double l) { return torque(l); } +constexpr auto operator"" _q_N_m_per_rad(unsigned long long l) { gsl_ExpectsAudit(std::in_range(l)); return torque(static_cast(l)); } +constexpr auto operator"" _q_N_m_per_rad(long double l) { return torque(l); } } // namespace literals diff --git a/test/unit_test/runtime/fmt_units_test.cpp b/test/unit_test/runtime/fmt_units_test.cpp index 2c202d1d..8f296680 100644 --- a/test/unit_test/runtime/fmt_units_test.cpp +++ b/test/unit_test/runtime/fmt_units_test.cpp @@ -312,7 +312,7 @@ TEST_CASE("fmt::format on synthesized unit symbols", "[text][fmt]") SECTION("torque") { - CHECK(fmt::format("{}", 1_q_Nm_per_rad) == "1 N ⋅ m/rad"); + CHECK(fmt::format("{}", 1_q_N_m_per_rad) == "1 N ⋅ m/rad"); } SECTION("storage_capacity")