mirror of
https://github.com/mpusz/mp-units.git
synced 2025-07-31 19:04:27 +02:00
[naming] change some more names
This commit is contained in:
@@ -764,15 +764,15 @@ template<int Complexity, NamedQuantitySpec Q>
|
|||||||
template<int Complexity, QuantitySpec Q, typename Num, typename... Nums, typename Den, typename... Dens>
|
template<int Complexity, QuantitySpec Q, typename Num, typename... Nums, typename Den, typename... Dens>
|
||||||
[[nodiscard]] consteval auto explode(Q, type_list<Num, Nums...>, type_list<Den, Dens...>)
|
[[nodiscard]] consteval auto explode(Q, type_list<Num, Nums...>, type_list<Den, Dens...>)
|
||||||
{
|
{
|
||||||
constexpr auto n = get_complexity(Num{});
|
constexpr auto num = get_complexity(Num{});
|
||||||
constexpr auto den = get_complexity(Den{});
|
constexpr auto den = get_complexity(Den{});
|
||||||
constexpr auto max_compl = n > den ? n : den;
|
constexpr auto max_compl = num > den ? num : den;
|
||||||
|
|
||||||
if constexpr (max_compl == Complexity || ((n >= den && !requires { explode_to_equation(Num{}); }) ||
|
if constexpr (max_compl == Complexity || ((num >= den && !requires { explode_to_equation(Num{}); }) ||
|
||||||
(n < den && !requires { explode_to_equation(Den{}); })))
|
(num < den && !requires { explode_to_equation(Den{}); })))
|
||||||
return explode_result{(map_power(Num{}) * ... * map_power(Nums{})) / (map_power(Den{}) * ... * map_power(Dens{}))};
|
return explode_result{(map_power(Num{}) * ... * map_power(Nums{})) / (map_power(Den{}) * ... * map_power(Dens{}))};
|
||||||
else {
|
else {
|
||||||
if constexpr (n >= den) {
|
if constexpr (num >= den) {
|
||||||
constexpr auto res = explode_to_equation(Num{});
|
constexpr auto res = explode_to_equation(Num{});
|
||||||
return explode<Complexity>((res.equation * ... * map_power(Nums{})) /
|
return explode<Complexity>((res.equation * ... * map_power(Nums{})) /
|
||||||
(map_power(Den{}) * ... * map_power(Dens{})))
|
(map_power(Den{}) * ... * map_power(Dens{})))
|
||||||
|
@@ -128,9 +128,9 @@ public:
|
|||||||
MP_UNITS_EXPECTS(detail::is_basic_literal_character_set(a));
|
MP_UNITS_EXPECTS(detail::is_basic_literal_character_set(a));
|
||||||
}
|
}
|
||||||
|
|
||||||
constexpr symbol_text(const fixed_u8string<N>& u, const fixed_string<M>& text) : unicode_(u), ascii_(text)
|
constexpr symbol_text(const fixed_u8string<N>& unicode, const fixed_string<M>& ascii) : unicode_(unicode), ascii_(ascii)
|
||||||
{
|
{
|
||||||
MP_UNITS_EXPECTS(detail::is_basic_literal_character_set(text.data_));
|
MP_UNITS_EXPECTS(detail::is_basic_literal_character_set(ascii.data_));
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]] constexpr const auto& unicode() const { return unicode_; }
|
[[nodiscard]] constexpr const auto& unicode() const { return unicode_; }
|
||||||
|
Reference in New Issue
Block a user