feedc0de/mp-units
1
0
Fork 0
forked from mpusz/mp-units
Code Pull Requests Activity

fix: torque literal fixed + experimental_angle example refactored

Browse Source
This commit is contained in:
Mateusz Pusz
2021-04-07 19:07:25 +02:00
parent dddc7572aa
commit 8ca2b25349
5 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/examples.rst
View File

@@ -17,5 +17,6 @@ Examples
examples/capacitor_time_curve examples/capacitor_time_curve
examples/clcpp_response examples/clcpp_response
examples/conversion_factor examples/conversion_factor
examples/experimental_angle
examples/kalman_filter-alpha_beta_filter_example2 examples/kalman_filter-alpha_beta_filter_example2
examples/total_energy examples/total_energy

7
docs/examples/experimental_angle.rst Normal file
View File

@@ -0,0 +1,7 @@
experimental_angle
==================
.. literalinclude:: ../../example/references/experimental_angle.cpp
:caption: experimental_angle.cpp
:start-at: #include
:linenos:

8
example/literals/experimental_angle.cpp
View File

@@ -22,21 +22,17 @@
#include <units/generic/angle.h> #include <units/generic/angle.h>
#include <units/isq/si/energy.h> #include <units/isq/si/energy.h>
#include <units/isq/si/force.h>
#include <units/isq/si/length.h>
#include <units/isq/si/torque.h> #include <units/isq/si/torque.h>
#include <units/quantity_io.h> #include <units/quantity_io.h>
#include <iostream> #include <iostream>
int main() int main()
{ {
using namespace units::literals;
using namespace units::isq; using namespace units::isq;
using namespace units::isq::si::literals; using namespace units::isq::si::literals;
Torque auto torque = 20.0_q_Nm_per_rad; const auto torque = 20.0_q_N_m_per_rad;
Energy auto energy = 20.0_q_J; const auto energy = 20.0_q_J;
units::Angle auto angle = energy / torque; units::Angle auto angle = energy / torque;

4
src/systems/si/include/units/isq/si/torque.h
View File

@@ -47,8 +47,8 @@ using torque = quantity<dim_torque, U, Rep>;
inline namespace literals { inline namespace literals {
// Nm // Nm
constexpr auto operator"" _q_Nm_per_rad(unsigned long long l) { gsl_ExpectsAudit(std::in_range<std::int64_t>(l)); return torque<newton_metre_per_radian, std::int64_t>(static_cast<std::int64_t>(l)); } constexpr auto operator"" _q_N_m_per_rad(unsigned long long l) { gsl_ExpectsAudit(std::in_range<std::int64_t>(l)); return torque<newton_metre_per_radian, std::int64_t>(static_cast<std::int64_t>(l)); }
constexpr auto operator"" _q_Nm_per_rad(long double l) { return torque<newton_metre_per_radian, long double>(l); } constexpr auto operator"" _q_N_m_per_rad(long double l) { return torque<newton_metre_per_radian, long double>(l); }
} // namespace literals } // namespace literals

2
test/unit_test/runtime/fmt_units_test.cpp
View File

@@ -312,7 +312,7 @@ TEST_CASE("fmt::format on synthesized unit symbols", "[text][fmt]")
SECTION("torque") 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") SECTION("storage_capacity")