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

refactor: small quantity and quantity_point interface cleanup

Browse Source
This commit is contained in:
Mateusz Pusz
2024-07-11 19:34:31 +02:00
parent dd52808999
commit e5e0e47c36
2 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/core/include/mp-units/framework/quantity.h
View File

@@ -99,6 +99,9 @@ using common_quantity_for = quantity<common_reference(Q1::reference, Q2::referen
template<auto R1, auto R2, typename Rep1, typename Rep2> template<auto R1, auto R2, typename Rep1, typename Rep2>
concept SameValueAs = detail::SameReference<R1, R2> && std::same_as<Rep1, Rep2>; concept SameValueAs = detail::SameReference<R1, R2> && std::same_as<Rep1, Rep2>;
template<typename T>
using quantity_like_type = quantity<quantity_like_traits<T>::reference, typename quantity_like_traits<T>::rep>;
} // namespace detail } // namespace detail
MP_UNITS_EXPORT_BEGIN MP_UNITS_EXPORT_BEGIN
@@ -177,8 +180,7 @@ public:
} }
template<QuantityLike Q> template<QuantityLike Q>
requires detail::QuantityConvertibleTo< requires detail::QuantityConvertibleTo<detail::quantity_like_type<Q>, quantity>
quantity<quantity_like_traits<Q>::reference, typename quantity_like_traits<Q>::rep>, quantity>
constexpr explicit(is_specialization_of<decltype(quantity_like_traits<Q>::to_numerical_value(std::declval<Q>())), constexpr explicit(is_specialization_of<decltype(quantity_like_traits<Q>::to_numerical_value(std::declval<Q>())),
convert_explicitly> || convert_explicitly> ||
// NOLINTNEXTLINE(google-explicit-constructor, hicpp-explicit-conversions) // NOLINTNEXTLINE(google-explicit-constructor, hicpp-explicit-conversions)
@@ -199,14 +201,14 @@ public:
return quantity<detail::make_reference(quantity_spec, ToU{}), Rep>{*this}; return quantity<detail::make_reference(quantity_spec, ToU{}), Rep>{*this};
} }
template<RepresentationOf<get_quantity_spec(R).character> ToRep> template<RepresentationOf<quantity_spec.character> ToRep>
requires detail::QuantityConvertibleTo<quantity, quantity<reference, ToRep>> requires detail::QuantityConvertibleTo<quantity, quantity<reference, ToRep>>
[[nodiscard]] constexpr QuantityOf<quantity_spec> auto in() const [[nodiscard]] constexpr QuantityOf<quantity_spec> auto in() const
{ {
return quantity<reference, ToRep>{*this}; return quantity<reference, ToRep>{*this};
} }
template<RepresentationOf<get_quantity_spec(R).character> ToRep, detail::UnitCompatibleWith<unit, quantity_spec> ToU> template<RepresentationOf<quantity_spec.character> ToRep, detail::UnitCompatibleWith<unit, quantity_spec> ToU>
requires detail::QuantityConvertibleTo<quantity, quantity<detail::make_reference(quantity_spec, ToU{}), ToRep>> requires detail::QuantityConvertibleTo<quantity, quantity<detail::make_reference(quantity_spec, ToU{}), ToRep>>
[[nodiscard]] constexpr QuantityOf<quantity_spec> auto in(ToU) const [[nodiscard]] constexpr QuantityOf<quantity_spec> auto in(ToU) const
{ {
@@ -220,14 +222,14 @@ public:
return value_cast<ToU{}>(*this); return value_cast<ToU{}>(*this);
} }
template<RepresentationOf<get_quantity_spec(R).character> ToRep> template<RepresentationOf<quantity_spec.character> ToRep>
requires requires(quantity q) { value_cast<ToRep>(q); } requires requires(quantity q) { value_cast<ToRep>(q); }
[[nodiscard]] constexpr QuantityOf<quantity_spec> auto force_in() const [[nodiscard]] constexpr QuantityOf<quantity_spec> auto force_in() const
{ {
return value_cast<ToRep>(*this); return value_cast<ToRep>(*this);
} }
template<RepresentationOf<get_quantity_spec(R).character> ToRep, detail::UnitCompatibleWith<unit, quantity_spec> ToU> template<RepresentationOf<quantity_spec.character> ToRep, detail::UnitCompatibleWith<unit, quantity_spec> ToU>
requires requires(quantity q) { value_cast<ToU{}, ToRep>(q); } requires requires(quantity q) { value_cast<ToU{}, ToRep>(q); }
[[nodiscard]] constexpr QuantityOf<quantity_spec> auto force_in(ToU) const [[nodiscard]] constexpr QuantityOf<quantity_spec> auto force_in(ToU) const
{ {
@@ -274,8 +276,7 @@ public:
// conversion operators // conversion operators
template<typename Q_, QuantityLike Q = std::remove_cvref_t<Q_>> template<typename Q_, QuantityLike Q = std::remove_cvref_t<Q_>>
requires detail::QuantityConvertibleTo< requires detail::QuantityConvertibleTo<quantity, detail::quantity_like_type<Q>>
quantity, quantity<quantity_like_traits<Q>::reference, typename quantity_like_traits<Q>::rep>>
[[nodiscard]] explicit(is_specialization_of<decltype(quantity_like_traits<Q>::from_numerical_value( [[nodiscard]] explicit(is_specialization_of<decltype(quantity_like_traits<Q>::from_numerical_value(
numerical_value_is_an_implementation_detail_)), numerical_value_is_an_implementation_detail_)),
convert_explicitly> || convert_explicitly> ||
@@ -289,8 +290,7 @@ public:
} }
template<typename Q_, QuantityLike Q = std::remove_cvref_t<Q_>> template<typename Q_, QuantityLike Q = std::remove_cvref_t<Q_>>
requires detail::QuantityConvertibleTo< requires detail::QuantityConvertibleTo<quantity, detail::quantity_like_type<Q>>
quantity, quantity<quantity_like_traits<Q>::reference, typename quantity_like_traits<Q>::rep>>
[[nodiscard]] explicit(is_specialization_of<decltype(quantity_like_traits<Q>::from_numerical_value( [[nodiscard]] explicit(is_specialization_of<decltype(quantity_like_traits<Q>::from_numerical_value(
numerical_value_is_an_implementation_detail_)), numerical_value_is_an_implementation_detail_)),
convert_explicitly> || convert_explicitly> ||
@@ -502,24 +502,23 @@ public:
requires detail::InvocableQuantities<std::multiplies<>, quantity, quantity<R2, Rep2>> requires detail::InvocableQuantities<std::multiplies<>, quantity, quantity<R2, Rep2>>
[[nodiscard]] friend constexpr Quantity auto operator*(const quantity& lhs, const quantity<R2, Rep2>& rhs) [[nodiscard]] friend constexpr Quantity auto operator*(const quantity& lhs, const quantity<R2, Rep2>& rhs)
{ {
return ::mp_units::quantity{lhs.numerical_value_ref_in(get_unit(R)) * rhs.numerical_value_ref_in(get_unit(R2)), return ::mp_units::quantity{lhs.numerical_value_ref_in(unit) * rhs.numerical_value_ref_in(rhs.unit), R * R2};
R * R2};
} }
template<typename Value> template<typename Value>
requires(!Quantity<Value>) && (!Reference<Value>) && requires(!Quantity<Value>) &&
detail::InvokeResultOf<get_quantity_spec(R).character, std::multiplies<>, Rep, const Value&> (!Reference<Value>) && detail::InvokeResultOf<quantity_spec.character, std::multiplies<>, Rep, const Value&>
[[nodiscard]] friend constexpr QuantityOf<get_quantity_spec(R)> auto operator*(const quantity& q, const Value& v) [[nodiscard]] friend constexpr QuantityOf<quantity_spec> auto operator*(const quantity& q, const Value& v)
{ {
return ::mp_units::quantity{q.numerical_value_ref_in(get_unit(R)) * v, R}; return ::mp_units::quantity{q.numerical_value_ref_in(unit) * v, R};
} }
template<typename Value> template<typename Value>
requires(!Quantity<Value>) && (!Reference<Value>) && requires(!Quantity<Value>) &&
detail::InvokeResultOf<get_quantity_spec(R).character, std::multiplies<>, const Value&, Rep> (!Reference<Value>) && detail::InvokeResultOf<quantity_spec.character, std::multiplies<>, const Value&, Rep>
[[nodiscard]] friend constexpr QuantityOf<get_quantity_spec(R)> auto operator*(const Value& v, const quantity& q) [[nodiscard]] friend constexpr QuantityOf<quantity_spec> auto operator*(const Value& v, const quantity& q)
{ {
return ::mp_units::quantity{v * q.numerical_value_ref_in(get_unit(R)), R}; return ::mp_units::quantity{v * q.numerical_value_ref_in(unit), R};
} }
template<auto R2, typename Rep2> template<auto R2, typename Rep2>
@@ -527,26 +526,24 @@ public:
[[nodiscard]] friend constexpr Quantity auto operator/(const quantity& lhs, const quantity<R2, Rep2>& rhs) [[nodiscard]] friend constexpr Quantity auto operator/(const quantity& lhs, const quantity<R2, Rep2>& rhs)
{ {
MP_UNITS_EXPECTS_DEBUG(rhs != rhs.zero()); MP_UNITS_EXPECTS_DEBUG(rhs != rhs.zero());
return ::mp_units::quantity{lhs.numerical_value_ref_in(get_unit(R)) / rhs.numerical_value_ref_in(get_unit(R2)), return ::mp_units::quantity{lhs.numerical_value_ref_in(unit) / rhs.numerical_value_ref_in(rhs.unit), R / R2};
R / R2};
} }
template<typename Value> template<typename Value>
requires(!Quantity<Value>) && (!Reference<Value>) && requires(!Quantity<Value>) &&
detail::InvokeResultOf<get_quantity_spec(R).character, std::divides<>, Rep, const Value&> (!Reference<Value>) && detail::InvokeResultOf<quantity_spec.character, std::divides<>, Rep, const Value&>
[[nodiscard]] friend constexpr QuantityOf<get_quantity_spec(R)> auto operator/(const quantity& q, const Value& v) [[nodiscard]] friend constexpr QuantityOf<quantity_spec> auto operator/(const quantity& q, const Value& v)
{ {
MP_UNITS_EXPECTS_DEBUG(v != quantity_values<Value>::zero()); MP_UNITS_EXPECTS_DEBUG(v != quantity_values<Value>::zero());
return ::mp_units::quantity{q.numerical_value_ref_in(get_unit(R)) / v, R}; return ::mp_units::quantity{q.numerical_value_ref_in(unit) / v, R};
} }
template<typename Value> template<typename Value>
requires(!Quantity<Value>) && (!Reference<Value>) && requires(!Quantity<Value>) &&
detail::InvokeResultOf<get_quantity_spec(R).character, std::divides<>, const Value&, Rep> (!Reference<Value>) && detail::InvokeResultOf<quantity_spec.character, std::divides<>, const Value&, Rep>
[[nodiscard]] friend constexpr QuantityOf<inverse(get_quantity_spec(R))> auto operator/(const Value& v, [[nodiscard]] friend constexpr QuantityOf<inverse(quantity_spec)> auto operator/(const Value& v, const quantity& q)
const quantity& q)
{ {
return ::mp_units::quantity{v / q.numerical_value_ref_in(get_unit(R)), ::mp_units::one / R}; return ::mp_units::quantity{v / q.numerical_value_ref_in(unit), ::mp_units::one / R};
} }
template<auto R2, typename Rep2> template<auto R2, typename Rep2>

12
src/core/include/mp-units/framework/quantity_point.h
View File

@@ -159,14 +159,14 @@ public:
~quantity_point() = default; ~quantity_point() = default;
template<typename Q> template<typename Q>
requires QuantityOf<std::remove_cvref_t<Q>, get_quantity_spec(R)> && std::constructible_from<quantity_type, Q> && requires QuantityOf<std::remove_cvref_t<Q>, quantity_spec> && std::constructible_from<quantity_type, Q> &&
(point_origin == default_point_origin(R)) && (implicitly_convertible(Q::quantity_spec, quantity_spec)) (point_origin == default_point_origin(R)) && (implicitly_convertible(Q::quantity_spec, quantity_spec))
constexpr explicit quantity_point(Q&& q) : quantity_from_origin_is_an_implementation_detail_(std::forward<Q>(q)) constexpr explicit quantity_point(Q&& q) : quantity_from_origin_is_an_implementation_detail_(std::forward<Q>(q))
{ {
} }
template<typename Q> template<typename Q>
requires QuantityOf<std::remove_cvref_t<Q>, get_quantity_spec(R)> && std::constructible_from<quantity_type, Q> requires QuantityOf<std::remove_cvref_t<Q>, quantity_spec> && std::constructible_from<quantity_type, Q>
constexpr quantity_point(Q&& q, decltype(PO)) : quantity_from_origin_is_an_implementation_detail_(std::forward<Q>(q)) constexpr quantity_point(Q&& q, decltype(PO)) : quantity_from_origin_is_an_implementation_detail_(std::forward<Q>(q))
{ {
} }
@@ -284,14 +284,14 @@ public:
return ::mp_units::quantity_point{quantity_ref_from(PO).in(ToU{}), PO}; return ::mp_units::quantity_point{quantity_ref_from(PO).in(ToU{}), PO};
} }
template<RepresentationOf<get_quantity_spec(R).character> ToRep> template<RepresentationOf<quantity_spec.character> ToRep>
requires detail::QuantityConvertibleTo<quantity_type, quantity<reference, ToRep>> requires detail::QuantityConvertibleTo<quantity_type, quantity<reference, ToRep>>
[[nodiscard]] constexpr QuantityPointOf<quantity_spec> auto in() const [[nodiscard]] constexpr QuantityPointOf<quantity_spec> auto in() const
{ {
return ::mp_units::quantity_point{quantity_ref_from(PO).template in<ToRep>(), PO}; return ::mp_units::quantity_point{quantity_ref_from(PO).template in<ToRep>(), PO};
} }
template<RepresentationOf<get_quantity_spec(R).character> ToRep, detail::UnitCompatibleWith<unit, quantity_spec> ToU> template<RepresentationOf<quantity_spec.character> ToRep, detail::UnitCompatibleWith<unit, quantity_spec> ToU>
requires detail::QuantityConvertibleTo<quantity_type, quantity<detail::make_reference(quantity_spec, ToU{}), ToRep>> requires detail::QuantityConvertibleTo<quantity_type, quantity<detail::make_reference(quantity_spec, ToU{}), ToRep>>
[[nodiscard]] constexpr QuantityPointOf<quantity_spec> auto in(ToU) const [[nodiscard]] constexpr QuantityPointOf<quantity_spec> auto in(ToU) const
{ {
@@ -305,14 +305,14 @@ public:
return ::mp_units::quantity_point{quantity_ref_from(PO).force_in(ToU{}), PO}; return ::mp_units::quantity_point{quantity_ref_from(PO).force_in(ToU{}), PO};
} }
template<RepresentationOf<get_quantity_spec(R).character> ToRep> template<RepresentationOf<quantity_spec.character> ToRep>
requires requires(quantity_type q) { value_cast<ToRep>(q); } requires requires(quantity_type q) { value_cast<ToRep>(q); }
[[nodiscard]] constexpr QuantityPointOf<quantity_spec> auto force_in() const [[nodiscard]] constexpr QuantityPointOf<quantity_spec> auto force_in() const
{ {
return ::mp_units::quantity_point{quantity_ref_from(PO).template force_in<ToRep>(), PO}; return ::mp_units::quantity_point{quantity_ref_from(PO).template force_in<ToRep>(), PO};
} }
template<RepresentationOf<get_quantity_spec(R).character> ToRep, detail::UnitCompatibleWith<unit, quantity_spec> ToU> template<RepresentationOf<quantity_spec.character> ToRep, detail::UnitCompatibleWith<unit, quantity_spec> ToU>
requires requires(quantity_type q) { value_cast<ToU{}, ToRep>(q); } requires requires(quantity_type q) { value_cast<ToU{}, ToRep>(q); }
[[nodiscard]] constexpr QuantityPointOf<quantity_spec> auto force_in(ToU) const [[nodiscard]] constexpr QuantityPointOf<quantity_spec> auto force_in(ToU) const
{ {