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

refactor: number() and number_in() renamed to value() and value_in()

Browse Source 
Resolves #423
This commit is contained in:
Mateusz Pusz
2023-08-23 17:15:32 +02:00
parent ae92b49775
commit a9204e2473
21 changed files with 349 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core-fmt/include/mp-units/format.h
+2 -2
View File
@@ -226,7 +226,7 @@ struct quantity_formatter {
explicit quantity_formatter(OutputIt o, quantity<Reference, Rep> q, const quantity_format_specs<CharT>& fspecs,
Locale lc) :
out(o), val(std::move(q).number()), specs(fspecs), loc(std::move(lc))
out(o), val(std::move(q).value()), specs(fspecs), loc(std::move(lc))
{
}
@@ -396,7 +396,7 @@ private:
if (begin == end || *begin == '}') {
// default format should print value followed by the unit separated with 1 space
out = mp_units::detail::format_units_quantity_value<CharT>(out, q.number(), specs.rep, ctx.locale());
out = mp_units::detail::format_units_quantity_value<CharT>(out, q.value(), specs.rep, ctx.locale());
if constexpr (mp_units::detail::has_unit_symbol(get_unit(Reference))) {
*out++ = CharT(' ');
out = unit_symbol_to<CharT>(out, get_unit(Reference));
src/core-io/include/mp-units/ostream.h
+3 -3
View File
@@ -36,9 +36,9 @@ void to_stream(std::basic_ostream<CharT, Traits>& os, const quantity<R, Rep>& q)
{
if constexpr (is_same_v<Rep, std::uint8_t> || is_same_v<Rep, std::int8_t>)
// promote the value to int
os << +q.number();
os << +q.value();
else
os << q.number();
os << q.value();
if constexpr (has_unit_symbol(get_unit(R))) {
os << " ";
unit_symbol_to<CharT>(std::ostream_iterator<CharT>(os), get_unit(R));
@@ -49,7 +49,7 @@ void to_stream(std::basic_ostream<CharT, Traits>& os, const quantity<R, Rep>& q)
template<typename CharT, typename Traits, auto R, typename Rep>
std::basic_ostream<CharT, Traits>& operator<<(std::basic_ostream<CharT, Traits>& os, const quantity<R, Rep>& q)
requires requires { os << q.number(); }
requires requires { os << q.value(); }
{
if (os.width()) {
// std::setw() applies to the whole quantity output so it has to be first put into std::string
src/core/include/mp-units/bits/quantity_cast.h
+2 -2
View File
@@ -51,9 +51,9 @@ template<QuantitySpec auto ToQS, typename Q>
{
if constexpr (detail::QuantityKindSpec<std::remove_const_t<decltype(ToQS)>> &&
AssociatedUnit<std::remove_const_t<decltype(q.unit)>>)
return make_quantity<q.unit>(std::forward<Q>(q).number());
return make_quantity<q.unit>(std::forward<Q>(q).value());
else
return make_quantity<reference<ToQS, q.unit>{}>(std::forward<Q>(q).number());
return make_quantity<reference<ToQS, q.unit>{}>(std::forward<Q>(q).value());
}
} // namespace mp_units
src/core/include/mp-units/bits/quantity_concepts.h
+1 -1
View File
@@ -74,7 +74,7 @@ concept QuantityLike = requires(T q) {
requires RepresentationOf<typename quantity_like_traits<T>::rep,
get_quantity_spec(quantity_like_traits<T>::reference).character>;
{
quantity_like_traits<T>::number(q)
quantity_like_traits<T>::value(q)
} -> std::convertible_to<typename quantity_like_traits<T>::rep>;
};
src/core/include/mp-units/bits/sudo_cast.h
+5 -5
View File
@@ -63,10 +63,10 @@ template<Quantity To, typename From>
if constexpr (q_unit == To::unit) {
// no scaling of the number needed
return make_quantity<To::reference>(static_cast<MP_UNITS_TYPENAME To::rep>(
std::forward<From>(q).number())); // 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
std::forward<From>(q).value())); // 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
constexpr Magnitude auto c_mag = get_canonical_unit(q_unit).mag / get_canonical_unit(To::unit).mag;
@@ -78,7 +78,7 @@ template<Quantity To, typename From>
using multiplier_type =
conditional<treat_as_floating_point<c_rep_type>, std::common_type_t<c_mag_type, long double>, c_mag_type>;
constexpr auto val = [](Magnitude auto m) { return get_value<multiplier_type>(m); };
return static_cast<MP_UNITS_TYPENAME To::rep>(static_cast<c_rep_type>(std::forward<From>(q).number()) * val(num) /
return static_cast<MP_UNITS_TYPENAME To::rep>(static_cast<c_rep_type>(std::forward<From>(q).value()) * val(num) /
val(den) * val(irr)) *
To::reference;
}
src/core/include/mp-units/customization_points.h
+1 -1
View File
@@ -136,7 +136,7 @@ struct quantity_values {
* @brief Provides support for external quantity-like types
*
* The type trait should provide the @c reference object, a type alias @c rep,
* and a static member function @c number(T) that returns the raw value of the quantity.
* and a static member function @c value(T) that returns the raw value of the quantity.
*
* Usage example can be found in @c units/chrono.h header file.
*
src/core/include/mp-units/quantity.h
+31 -31
View File
@@ -134,7 +134,7 @@ public:
template<detail::QuantityConvertibleTo<quantity> Q>
constexpr explicit(!std::convertible_to<typename Q::rep, Rep>) quantity(const Q& q) :
number_(detail::sudo_cast<quantity>(q).number())
number_(detail::sudo_cast<quantity>(q).value())
{
}
@@ -142,7 +142,7 @@ public:
requires detail::QuantityConvertibleTo<
quantity<quantity_like_traits<Q>::reference, typename quantity_like_traits<Q>::rep>, quantity>
constexpr explicit quantity(const Q& q) :
quantity(make_quantity<quantity_like_traits<Q>::reference>(quantity_like_traits<Q>::number(q)))
quantity(make_quantity<quantity_like_traits<Q>::reference>(quantity_like_traits<Q>::value(q)))
{
}
@@ -152,22 +152,22 @@ public:
// data access
#ifdef __cpp_explicit_this_parameter
template<typename Self>
[[nodiscard]] constexpr auto&& number(this Self&& self) noexcept
[[nodiscard]] constexpr auto&& value(this Self&& self) noexcept
{
return std::forward<Self>(self).number_;
}
#else
[[nodiscard]] constexpr rep& number() & noexcept { return number_; }
[[nodiscard]] constexpr const rep& number() const& noexcept { return number_; }
[[nodiscard]] constexpr rep&& number() && noexcept { return std::move(number_); }
[[nodiscard]] constexpr const rep&& number() const&& noexcept { return std::move(number_); }
[[nodiscard]] constexpr rep& value() & noexcept { return number_; }
[[nodiscard]] constexpr const rep& value() const& noexcept { return number_; }
[[nodiscard]] constexpr rep&& value() && noexcept { return std::move(number_); }
[[nodiscard]] constexpr const rep&& value() const&& noexcept { return std::move(number_); }
#endif
template<Unit U>
requires requires(quantity q) { q.in(U{}); }
[[nodiscard]] constexpr rep number_in(U) const noexcept
[[nodiscard]] constexpr rep value_in(U) const noexcept
{
return (*this).in(U{}).number();
return (*this).in(U{}).value();
}
template<Unit U>
@@ -185,7 +185,7 @@ public:
} -> std::common_with<rep>;
}
{
return make_quantity<reference>(+number());
return make_quantity<reference>(+value());
}
[[nodiscard]] constexpr Quantity auto operator-() const
@@ -195,7 +195,7 @@ public:
} -> std::common_with<rep>;
}
{
return make_quantity<reference>(-number());
return make_quantity<reference>(-value());
}
constexpr quantity& operator++()
@@ -247,7 +247,7 @@ public:
} -> std::same_as<rep&>;
}
{
number_ += q.number();
number_ += q.value();
return *this;
}
@@ -258,7 +258,7 @@ public:
} -> std::same_as<rep&>;
}
{
number_ -= q.number();
number_ -= q.value();
return *this;
}
@@ -282,7 +282,7 @@ public:
}
constexpr quantity& operator*=(const Q& rhs)
{
number_ *= rhs.number();
number_ *= rhs.value();
return *this;
}
@@ -307,8 +307,8 @@ public:
}
constexpr quantity& operator/=(const Q& rhs)
{
gsl_ExpectsAudit(rhs.number() != quantity_values<typename Q::rep>::zero());
number_ /= rhs.number();
gsl_ExpectsAudit(rhs.value() != quantity_values<typename Q::rep>::zero());
number_ /= rhs.value();
return *this;
}
@@ -319,8 +319,8 @@ public:
} -> std::same_as<rep&>;
}
{
gsl_ExpectsAudit(q.number() != quantity_values<rep>::zero());
number_ %= q.number();
gsl_ExpectsAudit(q.value() != quantity_values<rep>::zero());
number_ %= q.value();
return *this;
}
@@ -346,7 +346,7 @@ template<auto R1, typename Rep1, auto R2, typename Rep2>
[[nodiscard]] constexpr Quantity auto operator+(const quantity<R1, Rep1>& lhs, const quantity<R2, Rep2>& rhs)
{
using ret = detail::common_quantity_for<std::plus<>, quantity<R1, Rep1>, quantity<R2, Rep2>>;
return make_quantity<ret::reference>(ret(lhs).number() + ret(rhs).number());
return make_quantity<ret::reference>(ret(lhs).value() + ret(rhs).value());
}
template<auto R1, typename Rep1, auto R2, typename Rep2>
@@ -354,7 +354,7 @@ template<auto R1, typename Rep1, auto R2, typename Rep2>
[[nodiscard]] constexpr Quantity auto operator-(const quantity<R1, Rep1>& lhs, const quantity<R2, Rep2>& rhs)
{
using ret = detail::common_quantity_for<std::minus<>, quantity<R1, Rep1>, quantity<R2, Rep2>>;
return make_quantity<ret::reference>(ret(lhs).number() - ret(rhs).number());
return make_quantity<ret::reference>(ret(lhs).value() - ret(rhs).value());
}
template<auto R1, typename Rep1, auto R2, typename Rep2>
@@ -362,7 +362,7 @@ template<auto R1, typename Rep1, auto R2, typename Rep2>
Rep2>
[[nodiscard]] constexpr Quantity auto operator*(const quantity<R1, Rep1>& lhs, const quantity<R2, Rep2>& rhs)
{
return make_quantity<R1 * R2>(lhs.number() * rhs.number());
return make_quantity<R1 * R2>(lhs.value() * rhs.value());
}
template<auto R, typename Rep, typename Value>
@@ -370,7 +370,7 @@ template<auto R, typename Rep, typename Value>
detail::InvokeResultOf<get_quantity_spec(R).character, std::multiplies<>, Rep, const Value&>
[[nodiscard]] constexpr Quantity auto operator*(const quantity<R, Rep>& q, const Value& v)
{
return make_quantity<R>(q.number() * v);
return make_quantity<R>(q.value() * v);
}
template<typename Value, auto R, typename Rep>
@@ -378,15 +378,15 @@ template<typename Value, auto R, typename Rep>
detail::InvokeResultOf<get_quantity_spec(R).character, std::multiplies<>, const Value&, Rep>
[[nodiscard]] constexpr Quantity auto operator*(const Value& v, const quantity<R, Rep>& q)
{
return make_quantity<R>(v * q.number());
return make_quantity<R>(v * q.value());
}
template<auto R1, typename Rep1, auto R2, typename Rep2>
requires detail::InvokeResultOf<(get_quantity_spec(R1) / get_quantity_spec(R2)).character, std::divides<>, Rep1, Rep2>
[[nodiscard]] constexpr Quantity auto operator/(const quantity<R1, Rep1>& lhs, const quantity<R2, Rep2>& rhs)
{
gsl_ExpectsAudit(rhs.number() != quantity_values<Rep2>::zero());
return make_quantity<R1 / R2>(lhs.number() / rhs.number());
gsl_ExpectsAudit(rhs.value() != quantity_values<Rep2>::zero());
return make_quantity<R1 / R2>(lhs.value() / rhs.value());
}
template<auto R, typename Rep, typename Value>
@@ -395,7 +395,7 @@ template<auto R, typename Rep, typename Value>
[[nodiscard]] constexpr Quantity auto operator/(const quantity<R, Rep>& q, const Value& v)
{
gsl_ExpectsAudit(v != quantity_values<Value>::zero());
return make_quantity<R>(q.number() / v);
return make_quantity<R>(q.value() / v);
}
template<typename Value, auto R, typename Rep>
@@ -403,7 +403,7 @@ template<typename Value, auto R, typename Rep>
detail::InvokeResultOf<get_quantity_spec(R).character, std::divides<>, const Value&, Rep>
[[nodiscard]] constexpr Quantity auto operator/(const Value& v, const quantity<R, Rep>& q)
{
return make_quantity<::mp_units::one / R>(v / q.number());
return make_quantity<::mp_units::one / R>(v / q.value());
}
template<auto R1, typename Rep1, auto R2, typename Rep2>
@@ -411,9 +411,9 @@ template<auto R1, typename Rep1, auto R2, typename Rep2>
detail::InvocableQuantities<std::modulus<>, quantity<R1, Rep1>, quantity<R2, Rep2>>
[[nodiscard]] constexpr Quantity auto operator%(const quantity<R1, Rep1>& lhs, const quantity<R2, Rep2>& rhs)
{
gsl_ExpectsAudit(rhs.number() != quantity_values<Rep1>::zero());
gsl_ExpectsAudit(rhs.value() != quantity_values<Rep1>::zero());
using ret = detail::common_quantity_for<std::modulus<>, quantity<R1, Rep1>, quantity<R2, Rep2>>;
return make_quantity<ret::reference>(ret(lhs).number() % ret(rhs).number());
return make_quantity<ret::reference>(ret(lhs).value() % ret(rhs).value());
}
template<auto R1, typename Rep1, auto R2, typename Rep2>
@@ -422,7 +422,7 @@ template<auto R1, typename Rep1, auto R2, typename Rep2>
[[nodiscard]] constexpr bool operator==(const quantity<R1, Rep1>& lhs, const quantity<R2, Rep2>& rhs)
{
using ct = std::common_type_t<quantity<R1, Rep1>, quantity<R2, Rep2>>;
return ct(lhs).number() == ct(rhs).number();
return ct(lhs).value() == ct(rhs).value();
}
template<auto R1, typename Rep1, auto R2, typename Rep2>
@@ -431,7 +431,7 @@ template<auto R1, typename Rep1, auto R2, typename Rep2>
[[nodiscard]] constexpr auto operator<=>(const quantity<R1, Rep1>& lhs, const quantity<R2, Rep2>& rhs)
{
using ct = std::common_type_t<quantity<R1, Rep1>, quantity<R2, Rep2>>;
return ct(lhs).number() <=> ct(rhs).number();
return ct(lhs).value() <=> ct(rhs).value();
}
// make_quantity
src/core/include/mp-units/quantity_spec.h
+3 -3
View File
@@ -115,7 +115,7 @@ struct quantity_spec_interface {
requires Quantity<std::remove_cvref_t<Q>> &&
(explicitly_convertible(std::remove_reference_t<Q>::quantity_spec, self))
{
return make_quantity<reference<self, std::remove_cvref_t<Q>::unit>{}>(std::forward<Q>(q).number());
return make_quantity<reference<self, std::remove_cvref_t<Q>::unit>{}>(std::forward<Q>(q).value());
}
#else
template<typename Self_ = Self, UnitOf<Self_{}> U>
@@ -132,7 +132,7 @@ struct quantity_spec_interface {
(explicitly_convertible(std::remove_reference_t<Q>::quantity_spec, Self_{}))
[[nodiscard]] constexpr Quantity auto operator()(Q&& q) const
{
return make_quantity<reference<Self{}, std::remove_cvref_t<Q>::unit>{}>(std::forward<Q>(q).number());
return make_quantity<reference<Self{}, std::remove_cvref_t<Q>::unit>{}>(std::forward<Q>(q).value());
}
#endif
};
@@ -311,7 +311,7 @@ struct quantity_spec<Self, QS, Args...> : std::remove_const_t<decltype(QS)> {
(explicitly_convertible(std::remove_reference_t<Q>::quantity_spec, Self_{}))
[[nodiscard]] constexpr Quantity auto operator()(Q&& q) const
{
return make_quantity<reference<Self{}, std::remove_cvref_t<Q>::unit>{}>(std::forward<Q>(q).number());
return make_quantity<reference<Self{}, std::remove_cvref_t<Q>::unit>{}>(std::forward<Q>(q).value());
}
#endif
};
src/utility/include/mp-units/chrono.h
+2 -2
View File
@@ -64,7 +64,7 @@ template<typename Rep, typename Period>
struct quantity_like_traits<std::chrono::duration<Rep, Period>> {
static constexpr auto reference = detail::time_unit_from_chrono_period<Period>();
using rep = Rep;
[[nodiscard]] static constexpr rep number(const std::chrono::duration<Rep, Period>& q) { return q.count(); }
[[nodiscard]] static constexpr rep value(const std::chrono::duration<Rep, Period>& q) { return q.count(); }
};
template<typename C>
@@ -92,7 +92,7 @@ template<QuantityOf<isq::time> Q>
{
constexpr auto canonical = detail::get_canonical_unit(Q::unit);
constexpr ratio r = as_ratio(canonical.mag);
return std::chrono::duration<typename Q::rep, std::ratio<r.num, r.den>>{q.number()};
return std::chrono::duration<typename Q::rep, std::ratio<r.num, r.den>>{q.value()};
}
template<QuantityPointOf<isq::time> QP>
src/utility/include/mp-units/math.h
+48 -50
View File
@@ -54,7 +54,7 @@ template<std::intmax_t Num, std::intmax_t Den = 1, auto R, typename Rep>
requires detail::non_zero<Den> &&
requires { quantity_values<Rep>::one(); }
[[nodiscard]] constexpr quantity<pow<Num, Den>(R), Rep> pow(const quantity<R, Rep>& q) noexcept
requires requires { pow(q.number(), 1.0); } || requires { std::pow(q.number(), 1.0); }
requires requires { pow(q.value(), 1.0); } || requires { std::pow(q.value(), 1.0); }
{
if constexpr (Num == 0) {
return quantity<pow<Num, Den>(R), Rep>::one();
@@ -63,7 +63,7 @@ template<std::intmax_t Num, std::intmax_t Den = 1, auto R, typename Rep>
} else {
using std::pow;
return make_quantity<pow<Num, Den>(R)>(
static_cast<Rep>(pow(q.number(), static_cast<double>(Num) / static_cast<double>(Den))));
static_cast<Rep>(pow(q.value(), static_cast<double>(Num) / static_cast<double>(Den))));
}
}
@@ -77,10 +77,10 @@ template<std::intmax_t Num, std::intmax_t Den = 1, auto R, typename Rep>
*/
template<auto R, typename Rep>
[[nodiscard]] constexpr quantity<sqrt(R), Rep> sqrt(const quantity<R, Rep>& q) noexcept
requires requires { sqrt(q.number()); } || requires { std::sqrt(q.number()); }
requires requires { sqrt(q.value()); } || requires { std::sqrt(q.value()); }
{
using std::sqrt;
return make_quantity<sqrt(R)>(static_cast<Rep>(sqrt(q.number())));
return make_quantity<sqrt(R)>(static_cast<Rep>(sqrt(q.value())));
}
/**
@@ -93,10 +93,10 @@ template<auto R, typename Rep>
*/
template<auto R, typename Rep>
[[nodiscard]] constexpr quantity<cbrt(R), Rep> cbrt(const quantity<R, Rep>& q) noexcept
requires requires { cbrt(q.number()); } || requires { std::cbrt(q.number()); }
requires requires { cbrt(q.value()); } || requires { std::cbrt(q.value()); }
{
using std::cbrt;
return make_quantity<cbrt(R)>(static_cast<Rep>(cbrt(q.number())));
return make_quantity<cbrt(R)>(static_cast<Rep>(cbrt(q.value())));
}
/**
@@ -109,11 +109,11 @@ template<auto R, typename Rep>
*/
template<ReferenceOf<dimensionless> auto R, typename Rep>
[[nodiscard]] constexpr quantity<R, Rep> exp(const quantity<R, Rep>& q)
requires requires { exp(q.number()); } || requires { std::exp(q.number()); }
requires requires { exp(q.value()); } || requires { std::exp(q.value()); }
{
using std::exp;
return value_cast<get_unit(R)>(
make_quantity<detail::clone_reference_with<one>(R)>(static_cast<Rep>(exp(value_cast<one>(q).number()))));
make_quantity<detail::clone_reference_with<one>(R)>(static_cast<Rep>(exp(value_cast<one>(q).value()))));
}
/**
@@ -124,10 +124,10 @@ template<ReferenceOf<dimensionless> auto R, typename Rep>
*/
template<auto R, typename Rep>
[[nodiscard]] constexpr quantity<R, Rep> abs(const quantity<R, Rep>& q) noexcept
requires requires { abs(q.number()); } || requires { std::abs(q.number()); }
requires requires { abs(q.value()); } || requires { std::abs(q.value()); }
{
using std::abs;
return make_quantity<R>(static_cast<Rep>(abs(q.number())));
return make_quantity<R>(static_cast<Rep>(abs(q.value())));
}
/**
@@ -153,8 +153,7 @@ template<Representation Rep, Reference R>
*/
template<Unit auto To, auto R, typename Rep>
[[nodiscard]] constexpr quantity<detail::clone_reference_with<To>(R), Rep> floor(const quantity<R, Rep>& q) noexcept
requires((!treat_as_floating_point<Rep>) || requires { floor(q.number()); } ||
requires { std::floor(q.number()); }) &&
requires((!treat_as_floating_point<Rep>) || requires { floor(q.value()); } || requires { std::floor(q.value()); }) &&
(To == get_unit(R) || requires {
::mp_units::value_cast<To>(q);
quantity_values<Rep>::one();
@@ -169,10 +168,10 @@ template<Unit auto To, auto R, typename Rep>
if constexpr (treat_as_floating_point<Rep>) {
using std::floor;
if constexpr (To == get_unit(R)) {
return make_quantity<detail::clone_reference_with<To>(R)>(static_cast<Rep>(floor(q.number())));
return make_quantity<detail::clone_reference_with<To>(R)>(static_cast<Rep>(floor(q.value())));
} else {
return handle_signed_results(make_quantity<detail::clone_reference_with<To>(q.reference)>(
static_cast<Rep>(floor(value_cast<To>(q).number()))));
static_cast<Rep>(floor(value_cast<To>(q).value()))));
}
} else {
if constexpr (To == get_unit(R)) {
@@ -191,7 +190,7 @@ template<Unit auto To, auto R, typename Rep>
*/
template<Unit auto To, auto R, typename Rep>
[[nodiscard]] constexpr quantity<detail::clone_reference_with<To>(R), Rep> ceil(const quantity<R, Rep>& q) noexcept
requires((!treat_as_floating_point<Rep>) || requires { ceil(q.number()); } || requires { std::ceil(q.number()); }) &&
requires((!treat_as_floating_point<Rep>) || requires { ceil(q.value()); } || requires { std::ceil(q.value()); }) &&
(To == get_unit(R) || requires {
::mp_units::value_cast<To>(q);
quantity_values<Rep>::one();
@@ -206,10 +205,10 @@ template<Unit auto To, auto R, typename Rep>
if constexpr (treat_as_floating_point<Rep>) {
using std::ceil;
if constexpr (To == get_unit(R)) {
return make_quantity<detail::clone_reference_with<To>(q.reference)>(static_cast<Rep>(ceil(q.number())));
return make_quantity<detail::clone_reference_with<To>(q.reference)>(static_cast<Rep>(ceil(q.value())));
} else {
return handle_signed_results(make_quantity<detail::clone_reference_with<To>(q.reference)>(
static_cast<Rep>(ceil(value_cast<To>(q).number()))));
static_cast<Rep>(ceil(value_cast<To>(q).value()))));
}
} else {
if constexpr (To == get_unit(R)) {
@@ -230,8 +229,7 @@ template<Unit auto To, auto R, typename Rep>
*/
template<Unit auto To, auto R, typename Rep>
[[nodiscard]] constexpr quantity<detail::clone_reference_with<To>(R), Rep> round(const quantity<R, Rep>& q) noexcept
requires((!treat_as_floating_point<Rep>) || requires { round(q.number()); } ||
requires { std::round(q.number()); }) &&
requires((!treat_as_floating_point<Rep>) || requires { round(q.value()); } || requires { std::round(q.value()); }) &&
(To == get_unit(R) || requires {
::mp_units::floor<To>(q);
quantity_values<Rep>::one();
@@ -240,7 +238,7 @@ template<Unit auto To, auto R, typename Rep>
if constexpr (To == get_unit(R)) {
if constexpr (treat_as_floating_point<Rep>) {
using std::round;
return make_quantity<detail::clone_reference_with<To>(q.reference)>(static_cast<Rep>(round(q.number())));
return make_quantity<detail::clone_reference_with<To>(q.reference)>(static_cast<Rep>(round(q.value())));
} else {
return value_cast<To>(q);
}
@@ -250,7 +248,7 @@ template<Unit auto To, auto R, typename Rep>
const auto diff0 = q - res_low;
const auto diff1 = res_high - q;
if (diff0 == diff1) {
if (static_cast<int>(res_low.number()) & 1) {
if (static_cast<int>(res_low.value()) & 1) {
return res_high;
}
return res_low;
@@ -271,12 +269,12 @@ template<auto R1, typename Rep1, auto R2, typename Rep2>
const quantity<R1, Rep1>& x, const quantity<R2, Rep2>& y) noexcept
requires requires { common_reference(R1, R2); } &&
(
requires { hypot(x.number(), y.number()); } || requires { std::hypot(x.number(), y.number()); })
requires { hypot(x.value(), y.value()); } || requires { std::hypot(x.value(), y.value()); })
{
constexpr auto ref = common_reference(R1, R2);
constexpr auto unit = get_unit(ref);
using std::hypot;
return make_quantity<ref>(hypot(x.number_in(unit), y.number_in(unit)));
return make_quantity<ref>(hypot(x.value_in(unit), y.value_in(unit)));
}
/**
@@ -287,13 +285,13 @@ template<auto R1, typename Rep1, auto R2, typename Rep2, auto R3, typename Rep3>
[[nodiscard]] constexpr QuantityOf<get_quantity_spec(common_reference(R1, R2, R3))> auto hypot(
const quantity<R1, Rep1>& x, const quantity<R2, Rep2>& y, const quantity<R3, Rep3>& z) noexcept
requires requires { common_reference(R1, R2, R3); } && (
requires { hypot(x.number(), y.number(), z.number()); } ||
requires { std::hypot(x.number(), y.number(), z.number()); })
requires { hypot(x.value(), y.value(), z.value()); } ||
requires { std::hypot(x.value(), y.value(), z.value()); })
{
constexpr auto ref = common_reference(R1, R2);
constexpr auto unit = get_unit(ref);
using std::hypot;
return make_quantity<ref>(hypot(x.number_in(unit), y.number_in(unit), z.number_in(unit)));
return make_quantity<ref>(hypot(x.value_in(unit), y.value_in(unit), z.value_in(unit)));
}
namespace isq {
@@ -301,55 +299,55 @@ namespace isq {
template<ReferenceOf<angular_measure> auto R, typename Rep>
requires treat_as_floating_point<Rep>
[[nodiscard]] inline quantity<one, Rep> sin(const quantity<R, Rep>& q) noexcept
requires requires { sin(q.number()); } || requires { std::sin(q.number()); }
requires requires { sin(q.value()); } || requires { std::sin(q.value()); }
{
using std::sin;
return make_quantity<one>(static_cast<Rep>(sin(q.in(si::radian).number())));
return make_quantity<one>(static_cast<Rep>(sin(q.in(si::radian).value())));
}
template<ReferenceOf<angular_measure> auto R, typename Rep>
requires treat_as_floating_point<Rep>
[[nodiscard]] inline quantity<one, Rep> cos(const quantity<R, Rep>& q) noexcept
requires requires { cos(q.number()); } || requires { std::cos(q.number()); }
requires requires { cos(q.value()); } || requires { std::cos(q.value()); }
{
using std::cos;
return make_quantity<one>(static_cast<Rep>(cos(q.in(si::radian).number())));
return make_quantity<one>(static_cast<Rep>(cos(q.in(si::radian).value())));
}
template<ReferenceOf<angular_measure> auto R, typename Rep>
requires treat_as_floating_point<Rep>
[[nodiscard]] inline quantity<one, Rep> tan(const quantity<R, Rep>& q) noexcept
requires requires { tan(q.number()); } || requires { std::tan(q.number()); }
requires requires { tan(q.value()); } || requires { std::tan(q.value()); }
{
using std::tan;
return make_quantity<one>(static_cast<Rep>(tan(q.in(si::radian).number())));
return make_quantity<one>(static_cast<Rep>(tan(q.in(si::radian).value())));
}
template<ReferenceOf<dimensionless> auto R, typename Rep>
requires treat_as_floating_point<Rep>
[[nodiscard]] inline quantity<si::radian, Rep> asin(const quantity<R, Rep>& q) noexcept
requires requires { asin(q.number()); } || requires { std::asin(q.number()); }
requires requires { asin(q.value()); } || requires { std::asin(q.value()); }
{
using std::asin;
return make_quantity<si::radian>(static_cast<Rep>(asin(value_cast<one>(q).number())));
return make_quantity<si::radian>(static_cast<Rep>(asin(value_cast<one>(q).value())));
}
template<ReferenceOf<dimensionless> auto R, typename Rep>
requires treat_as_floating_point<Rep>
[[nodiscard]] inline quantity<si::radian, Rep> acos(const quantity<R, Rep>& q) noexcept
requires requires { acos(q.number()); } || requires { std::acos(q.number()); }
requires requires { acos(q.value()); } || requires { std::acos(q.value()); }
{
using std::acos;
return make_quantity<si::radian>(static_cast<Rep>(acos(value_cast<one>(q).number())));
return make_quantity<si::radian>(static_cast<Rep>(acos(value_cast<one>(q).value())));
}
template<ReferenceOf<dimensionless> auto R, typename Rep>
requires treat_as_floating_point<Rep>
[[nodiscard]] inline quantity<si::radian, Rep> atan(const quantity<R, Rep>& q) noexcept
requires requires { atan(q.number()); } || requires { std::atan(q.number()); }
requires requires { atan(q.value()); } || requires { std::atan(q.value()); }
{
using std::atan;
return make_quantity<si::radian>(static_cast<Rep>(atan(value_cast<one>(q).number())));
return make_quantity<si::radian>(static_cast<Rep>(atan(value_cast<one>(q).value())));
}
} // namespace isq
@@ -359,55 +357,55 @@ namespace angular {
template<ReferenceOf<angle> auto R, typename Rep>
requires treat_as_floating_point<Rep>
[[nodiscard]] inline quantity<one, Rep> sin(const quantity<R, Rep>& q) noexcept
requires requires { sin(q.number()); } || requires { std::sin(q.number()); }
requires requires { sin(q.value()); } || requires { std::sin(q.value()); }
{
using std::sin;
return make_quantity<one>(static_cast<Rep>(sin(q.in(radian).number())));
return make_quantity<one>(static_cast<Rep>(sin(q.in(radian).value())));
}
template<ReferenceOf<angle> auto R, typename Rep>
requires treat_as_floating_point<Rep>
[[nodiscard]] inline quantity<one, Rep> cos(const quantity<R, Rep>& q) noexcept
requires requires { cos(q.number()); } || requires { std::cos(q.number()); }
requires requires { cos(q.value()); } || requires { std::cos(q.value()); }
{
using std::cos;
return make_quantity<one>(static_cast<Rep>(cos(q.in(radian).number())));
return make_quantity<one>(static_cast<Rep>(cos(q.in(radian).value())));
}
template<ReferenceOf<angle> auto R, typename Rep>
requires treat_as_floating_point<Rep>
[[nodiscard]] inline quantity<one, Rep> tan(const quantity<R, Rep>& q) noexcept
requires requires { tan(q.number()); } || requires { std::tan(q.number()); }
requires requires { tan(q.value()); } || requires { std::tan(q.value()); }
{
using std::tan;
return make_quantity<one>(static_cast<Rep>(tan(q.in(radian).number())));
return make_quantity<one>(static_cast<Rep>(tan(q.in(radian).value())));
}
template<ReferenceOf<dimensionless> auto R, typename Rep>
requires treat_as_floating_point<Rep>
[[nodiscard]] inline quantity<radian, Rep> asin(const quantity<R, Rep>& q) noexcept
requires requires { asin(q.number()); } || requires { std::asin(q.number()); }
requires requires { asin(q.value()); } || requires { std::asin(q.value()); }
{
using std::asin;
return make_quantity<radian>(static_cast<Rep>(asin(value_cast<one>(q).number())));
return make_quantity<radian>(static_cast<Rep>(asin(value_cast<one>(q).value())));
}
template<ReferenceOf<dimensionless> auto R, typename Rep>
requires treat_as_floating_point<Rep>
[[nodiscard]] inline quantity<radian, Rep> acos(const quantity<R, Rep>& q) noexcept
requires requires { acos(q.number()); } || requires { std::acos(q.number()); }
requires requires { acos(q.value()); } || requires { std::acos(q.value()); }
{
using std::acos;
return make_quantity<radian>(static_cast<Rep>(acos(value_cast<one>(q).number())));
return make_quantity<radian>(static_cast<Rep>(acos(value_cast<one>(q).value())));
}
template<ReferenceOf<dimensionless> auto R, typename Rep>
requires treat_as_floating_point<Rep>
[[nodiscard]] inline quantity<radian, Rep> atan(const quantity<R, Rep>& q) noexcept
requires requires { atan(q.number()); } || requires { std::atan(q.number()); }
requires requires { atan(q.value()); } || requires { std::atan(q.value()); }
{
using std::atan;
return make_quantity<radian>(static_cast<Rep>(atan(value_cast<one>(q).number())));
return make_quantity<radian>(static_cast<Rep>(atan(value_cast<one>(q).value())));
}
} // namespace angular
src/utility/include/mp-units/random.h
+12 -12
View File
@@ -35,7 +35,7 @@ static std::vector<typename Q::rep> i_qty_to_rep(InputIt first, InputIt last)
std::vector<typename Q::rep> intervals_rep;
intervals_rep.reserve(static_cast<size_t>(std::distance(first, last)));
for (auto itr = first; itr != last; ++itr) {
intervals_rep.push_back(itr->number());
intervals_rep.push_back(itr->value());
}
return intervals_rep;
}
@@ -46,7 +46,7 @@ static std::vector<typename Q::rep> bl_qty_to_rep(std::initializer_list<Q>& bl)
std::vector<typename Q::rep> bl_rep;
bl_rep.reserve(bl.size());
for (const Q& qty : bl) {
bl_rep.push_back(qty.number());
bl_rep.push_back(qty.value());
}
return bl_rep;
}
@@ -88,7 +88,7 @@ struct uniform_int_distribution : public std::uniform_int_distribution<typename
using base = MP_UNITS_TYPENAME std::uniform_int_distribution<rep>;
uniform_int_distribution() : base() {}
uniform_int_distribution(const Q& a, const Q& b) : base(a.number(), b.number()) {}
uniform_int_distribution(const Q& a, const Q& b) : base(a.value(), b.value()) {}
template<typename Generator>
Q operator()(Generator& g)
@@ -110,7 +110,7 @@ struct uniform_real_distribution : public std::uniform_real_distribution<typenam
using base = MP_UNITS_TYPENAME std::uniform_real_distribution<rep>;
uniform_real_distribution() : base() {}
uniform_real_distribution(const Q& a, const Q& b) : base(a.number(), b.number()) {}
uniform_real_distribution(const Q& a, const Q& b) : base(a.value(), b.value()) {}
template<typename Generator>
Q operator()(Generator& g)
@@ -132,7 +132,7 @@ struct binomial_distribution : public std::binomial_distribution<typename Q::rep
using base = MP_UNITS_TYPENAME std::binomial_distribution<rep>;
binomial_distribution() : base() {}
binomial_distribution(const Q& t, double p) : base(t.number(), p) {}
binomial_distribution(const Q& t, double p) : base(t.value(), p) {}
template<typename Generator>
Q operator()(Generator& g)
@@ -153,7 +153,7 @@ struct negative_binomial_distribution : public std::negative_binomial_distributi
using base = MP_UNITS_TYPENAME std::negative_binomial_distribution<rep>;
negative_binomial_distribution() : base() {}
negative_binomial_distribution(const Q& k, double p) : base(k.number(), p) {}
negative_binomial_distribution(const Q& k, double p) : base(k.value(), p) {}
template<typename Generator>
Q operator()(Generator& g)
@@ -269,7 +269,7 @@ struct extreme_value_distribution : public std::extreme_value_distribution<typen
using base = MP_UNITS_TYPENAME std::extreme_value_distribution<rep>;
extreme_value_distribution() : base() {}
extreme_value_distribution(const Q& a, const rep& b) : base(a.number(), b) {}
extreme_value_distribution(const Q& a, const rep& b) : base(a.value(), b) {}
template<typename Generator>
Q operator()(Generator& g)
@@ -290,7 +290,7 @@ struct normal_distribution : public std::normal_distribution<typename Q::rep> {
using base = MP_UNITS_TYPENAME std::normal_distribution<rep>;
normal_distribution() : base() {}
normal_distribution(const Q& mean, const Q& stddev) : base(mean.number(), stddev.number()) {}
normal_distribution(const Q& mean, const Q& stddev) : base(mean.value(), stddev.value()) {}
template<typename Generator>
Q operator()(Generator& g)
@@ -312,7 +312,7 @@ struct lognormal_distribution : public std::lognormal_distribution<typename Q::r
using base = MP_UNITS_TYPENAME std::lognormal_distribution<rep>;
lognormal_distribution() : base() {}
lognormal_distribution(const Q& m, const Q& s) : base(m.number(), s.number()) {}
lognormal_distribution(const Q& m, const Q& s) : base(m.value(), s.value()) {}
template<typename Generator>
Q operator()(Generator& g)
@@ -353,7 +353,7 @@ struct cauchy_distribution : public std::cauchy_distribution<typename Q::rep> {
using base = MP_UNITS_TYPENAME std::cauchy_distribution<rep>;
cauchy_distribution() : base() {}
cauchy_distribution(const Q& a, const Q& b) : base(a.number(), b.number()) {}
cauchy_distribution(const Q& a, const Q& b) : base(a.value(), b.value()) {}
template<typename Generator>
Q operator()(Generator& g)
@@ -470,7 +470,7 @@ public:
template<typename UnaryOperation>
piecewise_constant_distribution(std::size_t nw, const Q& xmin, const Q& xmax, UnaryOperation fw) :
base(nw, xmin.number(), xmax.number(), [fw](rep val) { return fw(val * Q::reference); })
base(nw, xmin.value(), xmax.value(), [fw](rep val) { return fw(val * Q::reference); })
{
}
@@ -528,7 +528,7 @@ public:
template<typename UnaryOperation>
piecewise_linear_distribution(std::size_t nw, const Q& xmin, const Q& xmax, UnaryOperation fw) :
base(nw, xmin.number(), xmax.number(), [fw](rep val) { return fw(val * Q::reference); })
base(nw, xmin.value(), xmax.value(), [fw](rep val) { return fw(val * Q::reference); })
{
}