From b38b23ece2af413b699f53504da6db4ed55787fc Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Thu, 20 Jun 2024 07:31:22 +0200 Subject: [PATCH] refactor: `relative()` renamed to `delta()` --- .../kalman_filter/kalman_filter-example_6.cpp | 15 +++--- .../kalman_filter/kalman_filter-example_7.cpp | 15 +++--- .../kalman_filter/kalman_filter-example_8.cpp | 15 +++--- example/spectroscopy_units.cpp | 2 +- src/core/include/mp-units/bits/sudo_cast.h | 12 ++--- .../include/mp-units/framework/quantity.h | 48 +++++++++---------- .../mp-units/framework/quantity_cast.h | 2 +- .../mp-units/framework/quantity_spec.h | 6 +-- .../include/mp-units/framework/reference.h | 16 +++---- .../mp-units/framework/reference_concepts.h | 4 +- src/core/include/mp-units/math.h | 19 ++++---- .../include/mp-units/systems/si/units.h | 2 +- src/systems/include/mp-units/systems/usc.h | 2 +- test/static/quantity_point_test.cpp | 8 ++-- test/static/usc_test.cpp | 4 +- 15 files changed, 83 insertions(+), 87 deletions(-) diff --git a/example/kalman_filter/kalman_filter-example_6.cpp b/example/kalman_filter/kalman_filter-example_6.cpp index d70b974a..20e96137 100644 --- a/example/kalman_filter/kalman_filter-example_6.cpp +++ b/example/kalman_filter/kalman_filter-example_6.cpp @@ -62,14 +62,13 @@ int main() using estimate = kalman::system_state_estimate; using state = estimate::state_type; - const quantity process_noise_variance = 0.0001 * relative(pow<2>(deg_C)); - const estimate initial{state{qp{60. * relative(deg_C)}}, 100. * relative(deg_C)}; - const std::array measurements = {qp{49.986 * relative(deg_C)}, qp{49.963 * relative(deg_C)}, - qp{50.097 * relative(deg_C)}, qp{50.001 * relative(deg_C)}, - qp{50.018 * relative(deg_C)}, qp{50.05 * relative(deg_C)}, - qp{49.938 * relative(deg_C)}, qp{49.858 * relative(deg_C)}, - qp{49.965 * relative(deg_C)}, qp{50.114 * relative(deg_C)}}; - const quantity measurement_error = 0.1 * relative(deg_C); + const quantity process_noise_variance = 0.0001 * delta(pow<2>(deg_C)); + const estimate initial{state{qp{60. * delta(deg_C)}}, 100. * delta(deg_C)}; + const std::array measurements = {qp{49.986 * delta(deg_C)}, qp{49.963 * delta(deg_C)}, qp{50.097 * delta(deg_C)}, + qp{50.001 * delta(deg_C)}, qp{50.018 * delta(deg_C)}, qp{50.05 * delta(deg_C)}, + qp{49.938 * delta(deg_C)}, qp{49.858 * delta(deg_C)}, qp{49.965 * delta(deg_C)}, + qp{50.114 * delta(deg_C)}}; + const quantity measurement_error = 0.1 * delta(deg_C); const quantity measurement_variance = pow<2>(measurement_error); auto predict = [=](const estimate& current) { diff --git a/example/kalman_filter/kalman_filter-example_7.cpp b/example/kalman_filter/kalman_filter-example_7.cpp index 104d08f6..0fe7889f 100644 --- a/example/kalman_filter/kalman_filter-example_7.cpp +++ b/example/kalman_filter/kalman_filter-example_7.cpp @@ -62,14 +62,13 @@ int main() using estimate = kalman::system_state_estimate; using state = estimate::state_type; - const quantity process_noise_variance = 0.0001 * relative(pow<2>(deg_C)); - const estimate initial{state{qp{10. * relative(deg_C)}}, 100. * relative(deg_C)}; - const std::array measurements = {qp{50.486 * relative(deg_C)}, qp{50.963 * relative(deg_C)}, - qp{51.597 * relative(deg_C)}, qp{52.001 * relative(deg_C)}, - qp{52.518 * relative(deg_C)}, qp{53.05 * relative(deg_C)}, - qp{53.438 * relative(deg_C)}, qp{53.858 * relative(deg_C)}, - qp{54.465 * relative(deg_C)}, qp{55.114 * relative(deg_C)}}; - const quantity measurement_error = 0.1 * relative(deg_C); + const quantity process_noise_variance = 0.0001 * delta(pow<2>(deg_C)); + const estimate initial{state{qp{10. * delta(deg_C)}}, 100. * delta(deg_C)}; + const std::array measurements = {qp{50.486 * delta(deg_C)}, qp{50.963 * delta(deg_C)}, qp{51.597 * delta(deg_C)}, + qp{52.001 * delta(deg_C)}, qp{52.518 * delta(deg_C)}, qp{53.05 * delta(deg_C)}, + qp{53.438 * delta(deg_C)}, qp{53.858 * delta(deg_C)}, qp{54.465 * delta(deg_C)}, + qp{55.114 * delta(deg_C)}}; + const quantity measurement_error = 0.1 * delta(deg_C); const quantity measurement_variance = pow<2>(measurement_error); auto predict = [=](const estimate& current) { diff --git a/example/kalman_filter/kalman_filter-example_8.cpp b/example/kalman_filter/kalman_filter-example_8.cpp index d818140e..3f27a467 100644 --- a/example/kalman_filter/kalman_filter-example_8.cpp +++ b/example/kalman_filter/kalman_filter-example_8.cpp @@ -62,14 +62,13 @@ int main() using estimate = kalman::system_state_estimate; using state = estimate::state_type; - const quantity process_noise_variance = 0.15 * relative(pow<2>(deg_C)); - const estimate initial{state{qp{10. * relative(deg_C)}}, 100. * relative(deg_C)}; - const std::array measurements = {qp{50.486 * relative(deg_C)}, qp{50.963 * relative(deg_C)}, - qp{51.597 * relative(deg_C)}, qp{52.001 * relative(deg_C)}, - qp{52.518 * relative(deg_C)}, qp{53.05 * relative(deg_C)}, - qp{53.438 * relative(deg_C)}, qp{53.858 * relative(deg_C)}, - qp{54.465 * relative(deg_C)}, qp{55.114 * relative(deg_C)}}; - const quantity measurement_error = 0.1 * relative(deg_C); + const quantity process_noise_variance = 0.15 * delta(pow<2>(deg_C)); + const estimate initial{state{qp{10. * delta(deg_C)}}, 100. * delta(deg_C)}; + const std::array measurements = {qp{50.486 * delta(deg_C)}, qp{50.963 * delta(deg_C)}, qp{51.597 * delta(deg_C)}, + qp{52.001 * delta(deg_C)}, qp{52.518 * delta(deg_C)}, qp{53.05 * delta(deg_C)}, + qp{53.438 * delta(deg_C)}, qp{53.858 * delta(deg_C)}, qp{54.465 * delta(deg_C)}, + qp{55.114 * delta(deg_C)}}; + const quantity measurement_error = 0.1 * delta(deg_C); const quantity measurement_variance = pow<2>(measurement_error); auto predict = [=](const estimate& current) { diff --git a/example/spectroscopy_units.cpp b/example/spectroscopy_units.cpp index 85fe8344..d134e698 100644 --- a/example/spectroscopy_units.cpp +++ b/example/spectroscopy_units.cpp @@ -84,7 +84,7 @@ int main() const auto t3 = std::make_tuple(isq::energy(q3 * h), isq::wavenumber(q3 / c), q3, isq::thermodynamic_temperature(q3 * h / kb), isq::wavelength(c / q3)); - const auto q4 = isq::thermodynamic_temperature(1. * relative(K)); + const auto q4 = isq::thermodynamic_temperature(1. * delta(K)); const auto t4 = std::make_tuple(isq::energy(q4 * kb), isq::wavenumber(q4 * kb / (h * c)), isq::frequency(q4 * kb / h), q4, isq::wavelength(h * c / (q4 * kb))); diff --git a/src/core/include/mp-units/bits/sudo_cast.h b/src/core/include/mp-units/bits/sudo_cast.h index 768a5dc5..aefb2b13 100644 --- a/src/core/include/mp-units/bits/sudo_cast.h +++ b/src/core/include/mp-units/bits/sudo_cast.h @@ -97,10 +97,10 @@ template if constexpr (q_unit == To::unit) { // no scaling of the number needed return {static_cast(std::forward(q).numerical_value_is_an_implementation_detail_), - relative(To::reference)}; // this is the only (and recommended) way to do - // a truncating conversion on a number, so we are - // using static_cast to suppress all the compiler - // warnings on conversions + delta(To::reference)}; // this is the only (and recommended) way to do + // a truncating conversion on a number, so we are + // using static_cast to suppress all the compiler + // warnings on conversions } else { // scale the number using traits = magnitude_conversion_traits>; @@ -108,13 +108,13 @@ template // this results in great assembly auto res = static_cast( static_cast(q.numerical_value_is_an_implementation_detail_) * traits::ratio); - return {res, relative(To::reference)}; + return {res, delta(To::reference)}; } else { // this is slower but allows conversions like 2000 m -> 2 km without loosing data auto res = static_cast( static_cast(q.numerical_value_is_an_implementation_detail_) * traits::num_mult / traits::den_mult * traits::irr_mult); - return {res, relative(To::reference)}; + return {res, delta(To::reference)}; } } } diff --git a/src/core/include/mp-units/framework/quantity.h b/src/core/include/mp-units/framework/quantity.h index 44dd8742..28cdbafe 100644 --- a/src/core/include/mp-units/framework/quantity.h +++ b/src/core/include/mp-units/framework/quantity.h @@ -89,7 +89,7 @@ using common_quantity_for = quantity>; template -concept SameOriginalReferenceAs = RelativeReference && Reference && (get_original_reference(T{}) == R{}); +concept SameOriginalReferenceAs = DeltaReference && Reference && (get_original_reference(T{}) == R{}); template concept SameValueAs = detail::SameOriginalReferenceAs && std::same_as; @@ -123,25 +123,25 @@ public: [[nodiscard]] static constexpr quantity zero() noexcept requires requires { quantity_values::zero(); } { - return {quantity_values::zero(), relative(R)}; + return {quantity_values::zero(), delta(R)}; } [[nodiscard]] static constexpr quantity one() noexcept requires requires { quantity_values::one(); } { - return {quantity_values::one(), relative(R)}; + return {quantity_values::one(), delta(R)}; } [[nodiscard]] static constexpr quantity min() noexcept requires requires { quantity_values::min(); } { - return {quantity_values::min(), relative(R)}; + return {quantity_values::min(), delta(R)}; } [[nodiscard]] static constexpr quantity max() noexcept requires requires { quantity_values::max(); } { - return {quantity_values::max(), relative(R)}; + return {quantity_values::max(), delta(R)}; } // construction, assignment, destruction @@ -150,13 +150,13 @@ public: quantity(quantity&&) = default; ~quantity() = default; - template + template requires detail::SameValueAs, Rep> constexpr quantity(Value&& v, R2) : numerical_value_is_an_implementation_detail_(std::forward(v)) { } - template + template requires(!detail::SameValueAs, Rep>) && detail::QuantityConvertibleTo>, quantity> constexpr quantity(Value&& v, R2) : @@ -179,8 +179,8 @@ public: convert_explicitly> || // NOLINTNEXTLINE(google-explicit-constructor, hicpp-explicit-conversions) !std::convertible_to::rep, Rep>) quantity(const Q& q) : - quantity( - ::mp_units::quantity{quantity_like_traits::to_numerical_value(q).value, relative(quantity_like_traits::reference)}) + quantity(::mp_units::quantity{quantity_like_traits::to_numerical_value(q).value, + delta(quantity_like_traits::reference)}) { } @@ -274,7 +274,7 @@ public: } -> std::common_with; } { - return ::mp_units::quantity{+numerical_value_is_an_implementation_detail_, relative(reference)}; + return ::mp_units::quantity{+numerical_value_is_an_implementation_detail_, delta(reference)}; } [[nodiscard]] constexpr QuantityOf auto operator-() const @@ -284,7 +284,7 @@ public: } -> std::common_with; } { - return ::mp_units::quantity{-numerical_value_is_an_implementation_detail_, relative(reference)}; + return ::mp_units::quantity{-numerical_value_is_an_implementation_detail_, delta(reference)}; } template @@ -306,7 +306,7 @@ public: } -> std::common_with; } { - return ::mp_units::quantity{numerical_value_is_an_implementation_detail_++, relative(reference)}; + return ::mp_units::quantity{numerical_value_is_an_implementation_detail_++, delta(reference)}; } template @@ -328,7 +328,7 @@ public: } -> std::common_with; } { - return ::mp_units::quantity{numerical_value_is_an_implementation_detail_--, relative(reference)}; + return ::mp_units::quantity{numerical_value_is_an_implementation_detail_--, delta(reference)}; } // compound assignment operators @@ -427,7 +427,7 @@ public: }; // CTAD -template +template requires RepresentationOf quantity(Value v, R) -> quantity; @@ -445,7 +445,7 @@ template const ret ret_lhs(lhs); const ret ret_rhs(rhs); return quantity{ret_lhs.numerical_value_ref_in(ret::unit) + ret_rhs.numerical_value_ref_in(ret::unit), - relative(ret::reference)}; + delta(ret::reference)}; } template @@ -456,7 +456,7 @@ template const ret ret_lhs(lhs); const ret ret_rhs(rhs); return quantity{ret_lhs.numerical_value_ref_in(ret::unit) - ret_rhs.numerical_value_ref_in(ret::unit), - relative(ret::reference)}; + delta(ret::reference)}; } template @@ -469,15 +469,14 @@ template const ret ret_lhs(lhs); const ret ret_rhs(rhs); return quantity{ret_lhs.numerical_value_ref_in(ret::unit) % ret_rhs.numerical_value_ref_in(ret::unit), - relative(ret::reference)}; + delta(ret::reference)}; } template requires detail::InvocableQuantities, quantity, quantity> [[nodiscard]] constexpr Quantity auto operator*(const quantity& lhs, const quantity& rhs) { - return quantity{lhs.numerical_value_ref_in(get_unit(R1)) * rhs.numerical_value_ref_in(get_unit(R2)), - relative(R1 * R2)}; + return quantity{lhs.numerical_value_ref_in(get_unit(R1)) * rhs.numerical_value_ref_in(get_unit(R2)), delta(R1 * R2)}; } template @@ -485,7 +484,7 @@ template detail::InvokeResultOf, Rep, const Value&> [[nodiscard]] constexpr QuantityOf auto operator*(const quantity& q, const Value& v) { - return quantity{q.numerical_value_ref_in(get_unit(R)) * v, relative(R)}; + return quantity{q.numerical_value_ref_in(get_unit(R)) * v, delta(R)}; } template @@ -493,7 +492,7 @@ template detail::InvokeResultOf, const Value&, Rep> [[nodiscard]] constexpr QuantityOf auto operator*(const Value& v, const quantity& q) { - return quantity{v * q.numerical_value_ref_in(get_unit(R)), relative(R)}; + return quantity{v * q.numerical_value_ref_in(get_unit(R)), delta(R)}; } template @@ -501,8 +500,7 @@ template [[nodiscard]] constexpr Quantity auto operator/(const quantity& lhs, const quantity& rhs) { MP_UNITS_EXPECTS_DEBUG(rhs != rhs.zero()); - return quantity{lhs.numerical_value_ref_in(get_unit(R1)) / rhs.numerical_value_ref_in(get_unit(R2)), - relative(R1 / R2)}; + return quantity{lhs.numerical_value_ref_in(get_unit(R1)) / rhs.numerical_value_ref_in(get_unit(R2)), delta(R1 / R2)}; } template @@ -511,7 +509,7 @@ template [[nodiscard]] constexpr QuantityOf auto operator/(const quantity& q, const Value& v) { MP_UNITS_EXPECTS_DEBUG(v != quantity_values::zero()); - return quantity{q.numerical_value_ref_in(get_unit(R)) / v, relative(R)}; + return quantity{q.numerical_value_ref_in(get_unit(R)) / v, delta(R)}; } template @@ -520,7 +518,7 @@ template [[nodiscard]] constexpr QuantityOf auto operator/(const Value& v, const quantity& q) { - return quantity{v / q.numerical_value_ref_in(get_unit(R)), relative(::mp_units::one / R)}; + return quantity{v / q.numerical_value_ref_in(get_unit(R)), delta(::mp_units::one / R)}; } template diff --git a/src/core/include/mp-units/framework/quantity_cast.h b/src/core/include/mp-units/framework/quantity_cast.h index a915325a..081955d9 100644 --- a/src/core/include/mp-units/framework/quantity_cast.h +++ b/src/core/include/mp-units/framework/quantity_cast.h @@ -57,7 +57,7 @@ template [[nodiscard]] constexpr Quantity auto quantity_cast(Q&& q) { return quantity{std::forward(q).numerical_value_is_an_implementation_detail_, - relative(make_reference(ToQS, std::remove_reference_t::unit))}; + delta(make_reference(ToQS, std::remove_reference_t::unit))}; } /** diff --git a/src/core/include/mp-units/framework/quantity_spec.h b/src/core/include/mp-units/framework/quantity_spec.h index 3979f3e5..565ee049 100644 --- a/src/core/include/mp-units/framework/quantity_spec.h +++ b/src/core/include/mp-units/framework/quantity_spec.h @@ -129,7 +129,7 @@ struct quantity_spec_interface { (explicitly_convertible(std::remove_reference_t::quantity_spec, self)) { return quantity{std::forward(q).numerical_value_is_an_implementation_detail_, - relative(detail::make_reference(self, std::remove_cvref_t::unit))}; + delta(detail::make_reference(self, std::remove_cvref_t::unit))}; } #else template U> @@ -144,7 +144,7 @@ struct quantity_spec_interface { [[nodiscard]] constexpr Quantity auto operator()(Q&& q) const { return quantity{std::forward(q).numerical_value_is_an_implementation_detail_, - relative(detail::make_reference(Self{}, std::remove_cvref_t::unit))}; + delta(detail::make_reference(Self{}, std::remove_cvref_t::unit))}; } #endif }; @@ -341,7 +341,7 @@ struct quantity_spec : detail::propagate_equation, detail [[nodiscard]] constexpr Quantity auto operator()(Q&& q) const { return quantity{std::forward(q).numerical_value_is_an_implementation_detail_, - relative(detail::make_reference(Self{}, std::remove_cvref_t::unit))}; + delta(detail::make_reference(Self{}, std::remove_cvref_t::unit))}; } #endif }; diff --git a/src/core/include/mp-units/framework/reference.h b/src/core/include/mp-units/framework/reference.h index f0721d84..a9223f2e 100644 --- a/src/core/include/mp-units/framework/reference.h +++ b/src/core/include/mp-units/framework/reference.h @@ -41,7 +41,7 @@ template using reference_t = reference; template - requires RelativeReference || AbsoluteReference + requires DeltaReference || AbsoluteReference [[nodiscard]] consteval Reference auto get_original_reference(R r) { if constexpr (requires { typename R::_type_; }) @@ -183,19 +183,19 @@ struct reference { }; -template +template requires RepresentationOf, get_quantity_spec(detail::get_original_reference(R{})).character> [[nodiscard]] constexpr quantity> operator*(Rep&& lhs, R) { return quantity{std::forward(lhs), R{}}; } -template +template requires RepresentationOf, get_quantity_spec(detail::get_original_reference(R{})).character> [[nodiscard]] constexpr quantity> operator/( Rep&& lhs, R) { - return quantity{std::forward(lhs), relative(inverse(detail::get_original_reference(R{})))}; + return quantity{std::forward(lhs), delta(inverse(detail::get_original_reference(R{})))}; } template @@ -205,7 +205,7 @@ template std::remove_cvref_t> operator*(Rep&& lhs, R) { - return quantity_point{std::forward(lhs) * relative(detail::get_original_reference(R{}))}; + return quantity_point{std::forward(lhs) * delta(detail::get_original_reference(R{}))}; } template @@ -215,7 +215,7 @@ template std::remove_cvref_t> operator/(Rep&& lhs, R) { - return quantity_point{std::forward(lhs) * relative(inverse(detail::get_original_reference(R{})))}; + return quantity_point{std::forward(lhs) * delta(inverse(detail::get_original_reference(R{})))}; } template @@ -233,7 +233,7 @@ template [[nodiscard]] constexpr Quantity auto operator*(Q&& q, R) { return quantity{std::forward(q).numerical_value_is_an_implementation_detail_, - relative(std::remove_cvref_t::reference * R{})}; + delta(std::remove_cvref_t::reference * R{})}; } template @@ -241,7 +241,7 @@ template [[nodiscard]] constexpr Quantity auto operator/(Q&& q, R) { return quantity{std::forward(q).numerical_value_is_an_implementation_detail_, - relative(std::remove_cvref_t::reference / R{})}; + delta(std::remove_cvref_t::reference / R{})}; } template diff --git a/src/core/include/mp-units/framework/reference_concepts.h b/src/core/include/mp-units/framework/reference_concepts.h index 857dbd0b..91bd1a73 100644 --- a/src/core/include/mp-units/framework/reference_concepts.h +++ b/src/core/include/mp-units/framework/reference_concepts.h @@ -91,7 +91,7 @@ struct absolute_ final { }; template -MP_UNITS_EXPORT [[nodiscard]] consteval relative_ relative(R) +MP_UNITS_EXPORT [[nodiscard]] consteval relative_ delta(R) { return {}; } @@ -103,7 +103,7 @@ MP_UNITS_EXPORT [[nodiscard]] consteval absolute_ absolute(R) } template -MP_UNITS_EXPORT concept RelativeReference = +MP_UNITS_EXPORT concept DeltaReference = (Reference && !requires { get_unit(T{}).point_origin; }) || is_specialization_of; template diff --git a/src/core/include/mp-units/math.h b/src/core/include/mp-units/math.h index b2859dfd..c357a7d9 100644 --- a/src/core/include/mp-units/math.h +++ b/src/core/include/mp-units/math.h @@ -115,7 +115,7 @@ template auto R, typename Rep> { using std::exp; return value_cast( - quantity{static_cast(exp(q.force_numerical_value_in(q.unit))), relative(detail::clone_reference_with(R))}); + quantity{static_cast(exp(q.force_numerical_value_in(q.unit))), delta(detail::clone_reference_with(R))}); } /** @@ -236,7 +236,7 @@ template using std::fma; return quantity{ fma(a.numerical_value_ref_in(a.unit), x.numerical_value_ref_in(x.unit), b.numerical_value_ref_in(b.unit)), - relative(common_reference(R * S, T))}; + delta(common_reference(R * S, T))}; } /** @@ -260,7 +260,7 @@ template constexpr auto ref = common_reference(R1, R2); constexpr auto unit = get_unit(ref); using std::fmod; - return quantity{fmod(x.numerical_value_in(unit), y.numerical_value_in(unit)), relative(ref)}; + return quantity{fmod(x.numerical_value_in(unit), y.numerical_value_in(unit)), delta(ref)}; } /** @@ -294,7 +294,7 @@ template constexpr auto ref = common_reference(R1, R2); constexpr auto unit = get_unit(ref); using std::remainder; - return quantity{remainder(x.numerical_value_in(unit), y.numerical_value_in(unit)), relative(ref)}; + return quantity{remainder(x.numerical_value_in(unit), y.numerical_value_in(unit)), delta(ref)}; } @@ -339,7 +339,7 @@ template return {static_cast(floor(q.numerical_value_ref_in(q.unit))), detail::clone_reference_with(R)}; } else { return handle_signed_results( - quantity{static_cast(floor(q.force_numerical_value_in(To))), relative(detail::clone_reference_with(R))}); + quantity{static_cast(floor(q.force_numerical_value_in(To))), delta(detail::clone_reference_with(R))}); } } else { if constexpr (To == get_unit(R)) { @@ -376,7 +376,7 @@ template return {static_cast(ceil(q.numerical_value_ref_in(q.unit))), detail::clone_reference_with(R)}; } else { return handle_signed_results( - quantity{static_cast(ceil(q.force_numerical_value_in(To))), relative(detail::clone_reference_with(R))}); + quantity{static_cast(ceil(q.force_numerical_value_in(To))), delta(detail::clone_reference_with(R))}); } } else { if constexpr (To == get_unit(R)) { @@ -456,7 +456,7 @@ template constexpr auto ref = common_reference(R1, R2); constexpr auto unit = get_unit(ref); using std::hypot; - return quantity{hypot(x.numerical_value_in(unit), y.numerical_value_in(unit)), relative(ref)}; + return quantity{hypot(x.numerical_value_in(unit), y.numerical_value_in(unit)), delta(ref)}; } /** @@ -474,7 +474,8 @@ template constexpr auto ref = common_reference(R1, R2); constexpr auto unit = get_unit(ref); using std::hypot; - return quantity{hypot(x.numerical_value_in(unit), y.numerical_value_in(unit), z.numerical_value_in(unit)), relative(ref)}; + return quantity{hypot(x.numerical_value_in(unit), y.numerical_value_in(unit), z.numerical_value_in(unit)), + delta(ref)}; } } // namespace mp_units diff --git a/src/systems/include/mp-units/systems/si/units.h b/src/systems/include/mp-units/systems/si/units.h index f358083e..21813bb0 100644 --- a/src/systems/include/mp-units/systems/si/units.h +++ b/src/systems/include/mp-units/systems/si/units.h @@ -77,7 +77,7 @@ inline constexpr struct weber final : named_unit<"Wb", volt * second> {} weber; inline constexpr struct tesla final : named_unit<"T", weber / square(metre)> {} tesla; inline constexpr struct henry final : named_unit<"H", weber / ampere> {} henry; -inline constexpr struct ice_point final : relative_point_origin)}> {} ice_point; +inline constexpr struct ice_point final : relative_point_origin)}> {} ice_point; inline constexpr auto zeroth_degree_Celsius = ice_point; inline constexpr struct degree_Celsius final : named_unit {} degree_Celsius; diff --git a/src/systems/include/mp-units/systems/usc.h b/src/systems/include/mp-units/systems/usc.h index 3b1e6bea..691f18d4 100644 --- a/src/systems/include/mp-units/systems/usc.h +++ b/src/systems/include/mp-units/systems/usc.h @@ -118,7 +118,7 @@ inline constexpr struct troy_pound final : named_unit<"lb t", mag<12> * troy_onc inline constexpr struct inch_of_mercury final : named_unit<"inHg", mag_ratio<3'386'389, 1'000> * si::pascal> {} inch_of_mercury; // https://en.wikipedia.org/wiki/United_States_customary_units#Temperature -inline constexpr struct zeroth_degree_Fahrenheit final : relative_point_origin * si::degree_Celsius)}> {} zeroth_degree_Fahrenheit; +inline constexpr struct zeroth_degree_Fahrenheit final : relative_point_origin * si::degree_Celsius)}> {} zeroth_degree_Fahrenheit; inline constexpr struct degree_Fahrenheit final : named_unit * si::degree_Celsius, zeroth_degree_Fahrenheit> {} degree_Fahrenheit; // clang-format on diff --git a/test/static/quantity_point_test.cpp b/test/static/quantity_point_test.cpp index 671f3527..ccf1c479 100644 --- a/test/static/quantity_point_test.cpp +++ b/test/static/quantity_point_test.cpp @@ -803,10 +803,10 @@ static_assert( static_assert(quantity_point{42 * m}.quantity_from_zero() == 42 * m); static_assert((42 * absolute(m)).quantity_from_zero() == 42 * m); static_assert(quantity_point{isq::height(42 * m)}.quantity_from_zero() == 42 * m); -static_assert(quantity_point{20 * relative(deg_C)}.quantity_from_zero() == 20 * relative(deg_C)); -static_assert((20 * absolute(deg_C)).quantity_from_zero() == 20 * relative(deg_C)); -static_assert(quantity_point{20. * relative(deg_C)}.in(deg_F).quantity_from_zero() == 68 * relative(deg_F)); -static_assert((20. * absolute(deg_C)).in(deg_F).quantity_from_zero() == 68 * relative(deg_F)); +static_assert(quantity_point{20 * delta(deg_C)}.quantity_from_zero() == 20 * delta(deg_C)); +static_assert((20 * absolute(deg_C)).quantity_from_zero() == 20 * delta(deg_C)); +static_assert(quantity_point{20. * delta(deg_C)}.in(deg_F).quantity_from_zero() == 68 * delta(deg_F)); +static_assert((20. * absolute(deg_C)).in(deg_F).quantity_from_zero() == 68 * delta(deg_F)); static_assert((mean_sea_level + 42 * m).quantity_from_zero() == 42 * m); static_assert((ground_level + 42 * m).quantity_from_zero() == 84 * m); diff --git a/test/static/usc_test.cpp b/test/static/usc_test.cpp index 480c5c57..f6b9228b 100644 --- a/test/static/usc_test.cpp +++ b/test/static/usc_test.cpp @@ -126,7 +126,7 @@ static_assert(isq::mass(1 * lb_t) == isq::mass(12 * oz_t)); static_assert(isq::pressure(1'000 * inHg) == isq::pressure(3'386'389 * si::pascal)); // Temperature -static_assert(isq::thermodynamic_temperature(9 * relative(deg_F)) == - isq::thermodynamic_temperature(5 * relative(si::degree_Celsius))); +static_assert(isq::thermodynamic_temperature(9 * delta(deg_F)) == + isq::thermodynamic_temperature(5 * delta(si::degree_Celsius))); } // namespace