mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-08-04 12:54:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: power::ratio renamed to power::exponent

Browse Source
This commit is contained in:
Mateusz Pusz
2022-09-22 10:23:41 +02:00
parent 726c67b194
commit 79ef21b2a5
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/include/units/bits/expression_template.h
View File

@@ -37,11 +37,9 @@ struct per {};
template<typename F, int Num, int... Den> template<typename F, int Num, int... Den>
struct power { struct power {
using factor = F; using factor = F;
static constexpr ::units::ratio ratio{Num, Den...}; static constexpr ratio exponent{Num, Den...};
}; };
// TODO make_power() that will simplify cases like <dim_length, 2, 2>?
namespace detail { namespace detail {
template<typename T> template<typename T>
@@ -55,7 +53,7 @@ inline constexpr bool is_specialization_of_power<power<F, Ints...>> = true;
namespace detail { namespace detail {
template<typename T, auto R> template<typename T, auto R>
// template<typename T, raio R> // TODO // template<typename T, ratio R> // TODO
consteval auto power_or_T_impl() consteval auto power_or_T_impl()
{ {
if constexpr (R.den == 1) { if constexpr (R.den == 1) {
@@ -132,12 +130,12 @@ struct expr_consolidate_impl<type_list<T, T, Rest...>> {
template<typename T, int... Ints, typename... Rest> template<typename T, int... Ints, typename... Rest>
struct expr_consolidate_impl<type_list<T, power<T, Ints...>, Rest...>> { struct expr_consolidate_impl<type_list<T, power<T, Ints...>, Rest...>> {
using type = expr_consolidate_impl<type_list<power_or_T<T, power<T, Ints...>::ratio + 1>, Rest...>>::type; using type = expr_consolidate_impl<type_list<power_or_T<T, power<T, Ints...>::exponent + 1>, Rest...>>::type;
}; };
template<typename T, int... Ints1, int... Ints2, typename... Rest> template<typename T, int... Ints1, int... Ints2, typename... Rest>
struct expr_consolidate_impl<type_list<power<T, Ints1...>, power<T, Ints2...>, Rest...>> { struct expr_consolidate_impl<type_list<power<T, Ints1...>, power<T, Ints2...>, Rest...>> {
static constexpr ratio r = power<T, Ints1...>::ratio + power<T, Ints2...>::ratio; static constexpr ratio r = power<T, Ints1...>::exponent + power<T, Ints2...>::exponent;
using type = conditional<r.num == 0, typename expr_consolidate_impl<type_list<Rest...>>::type, using type = conditional<r.num == 0, typename expr_consolidate_impl<type_list<Rest...>>::type,
typename expr_consolidate_impl<type_list<power_or_T<T, r>, Rest...>>::type>; typename expr_consolidate_impl<type_list<power_or_T<T, r>, Rest...>>::type>;
}; };
@@ -150,7 +148,7 @@ using expr_consolidate = typename expr_consolidate_impl<List>::type;
template<typename T, typename powerNum, typename powerDen> template<typename T, typename powerNum, typename powerDen>
struct expr_simplify_power { struct expr_simplify_power {
static constexpr ratio r = powerNum::ratio - powerDen::ratio; static constexpr ratio r = powerNum::exponent - powerDen::exponent;
using type = power_or_T<T, ratio{abs(r.num), r.den}>; using type = power_or_T<T, ratio{abs(r.num), r.den}>;
using num = conditional<(r > 0), type_list<type>, type_list<>>; using num = conditional<(r > 0), type_list<type>, type_list<>>;
using den = conditional<(r < 0), type_list<type>, type_list<>>; using den = conditional<(r < 0), type_list<type>, type_list<>>;