mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-08-03 20:34:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: quantity_spec ingredients sorting fixed

Browse Source
This commit is contained in:
Mateusz Pusz
2023-05-25 11:59:09 +02:00
parent 002d5b4275
commit 32fcbd7829
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/include/mp_units/quantity_spec.h
View File

@@ -569,16 +569,29 @@ template<QuantitySpec Q>
return 1; return 1;
} }
// dimension_one is always the last one
// otherwise, sort by typename
template<Dimension D1, Dimension D2>
[[nodiscard]] consteval bool ingredients_dimension_less(D1 lhs, D2 rhs)
{
if constexpr (lhs == rhs)
return false;
else if constexpr (lhs == dimension_one)
return false;
else if constexpr (rhs == dimension_one)
return true;
else
return type_name<D1>() < type_name<D2>();
}
template<QuantitySpec Lhs, QuantitySpec Rhs, bool lhs_eq = requires { Lhs::_equation_; }, template<QuantitySpec Lhs, QuantitySpec Rhs, bool lhs_eq = requires { Lhs::_equation_; },
bool rhs_eq = requires { Rhs::_equation_; }, ratio lhs_compl = get_complexity(Lhs{}), bool rhs_eq = requires { Rhs::_equation_; }, ratio lhs_compl = get_complexity(Lhs{}),
ratio rhs_compl = get_complexity(Rhs{})> ratio rhs_compl = get_complexity(Rhs{})>
struct ingredients_less : struct ingredients_less :
std::bool_constant< std::bool_constant<(lhs_compl > rhs_compl) ||
(lhs_compl > rhs_compl) || (lhs_compl == rhs_compl && ingredients_dimension_less(Lhs::dimension, Rhs::dimension)) ||
(lhs_compl == rhs_compl && (Lhs::dimension != Rhs::dimension && Rhs::dimension == dimension_one) || (lhs_compl == rhs_compl && Lhs::dimension == Rhs::dimension &&
type_name<std::remove_const_t<decltype(Lhs::dimension)>>() < type_name<Lhs>() < type_name<Rhs>())> {};
type_name<std::remove_const_t<decltype(Rhs::dimension)>>()) ||
(lhs_compl == rhs_compl && Lhs::dimension == Rhs::dimension && type_name<Lhs>() < type_name<Rhs>())> {};
template<typename T1, typename T2> template<typename T1, typename T2>
using type_list_of_ingredients_less = expr_less<T1, T2, ingredients_less>; using type_list_of_ingredients_less = expr_less<T1, T2, ingredients_less>;