mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-07-30 18:37:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Double sorting of exponents removed

Browse Source
This commit is contained in:
Mateusz Pusz
2019-07-18 10:01:42 +02:00
parent f80fcad920
commit 7cbeb35e17
3 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
doc/DESIGN.md
View File

@ -179,17 +179,6 @@ contained base dimensions. Beside providing ordering to base dimensions it also
- aggregate two arguments of the same base dimension but different exponents - aggregate two arguments of the same base dimension but different exponents
- eliminate two arguments of the same base dimension and with opposite equal exponents - eliminate two arguments of the same base dimension and with opposite equal exponents
Additionally, it would be good if the final type produced by `make_dimension_t` would be easy to
understand for the user. For example we may decide to order base dimensions with decreasing order of
their exponents. That is why second sorting of a type list may be required. For example:
```cpp
template<Exponent... Es>
struct make_dimension {
using type = mp::type_list_sort_t<detail::dim_consolidate_t<mp::type_list_sort_t<dimension<Es...>, exp_dim_id_less>>, exp_greater_equal>;
};
```
#### `merge_dimension` #### `merge_dimension`
@ -218,7 +207,7 @@ Example implementation of `merge_dimension` may look like:
```cpp ```cpp
template<Dimension D1, Dimension D2> template<Dimension D1, Dimension D2>
struct merge_dimension { struct merge_dimension {
using type = mp::type_list_sort_t<detail::dim_consolidate_t<mp::type_list_merge_sorted_t<D1, D2, exp_dim_id_less>>, exp_greater_equal>; using type = detail::dim_consolidate_t<mp::type_list_merge_sorted_t<D1, D2, exp_dim_id_less>>;
}; };
``` ```

10
src/include/units/dimension.h
View File

@ -65,12 +65,6 @@ namespace units {
struct exp_dim_id_less : dim_id_less<typename E1::dimension, typename E2::dimension> { struct exp_dim_id_less : dim_id_less<typename E1::dimension, typename E2::dimension> {
}; };
// exp_dim_id_less
template<Exponent E1, Exponent E2>
struct exp_greater_equal : std::bool_constant<(E1::value >= E2::value)> {
};
// exp_invert // exp_invert
template<Exponent E> template<Exponent E>
@ -154,7 +148,7 @@ namespace units {
template<Exponent... Es> template<Exponent... Es>
struct make_dimension { struct make_dimension {
using type = type_list_sort<detail::dim_consolidate_t<type_list_sort<dimension<Es...>, exp_dim_id_less>>, exp_greater_equal>; using type = detail::dim_consolidate_t<type_list_sort<dimension<Es...>, exp_dim_id_less>>;
}; };
template<Exponent... Es> template<Exponent... Es>
@ -162,7 +156,7 @@ namespace units {
template<Dimension D1, Dimension D2> template<Dimension D1, Dimension D2>
struct merge_dimension { struct merge_dimension {
using type = type_list_sort<detail::dim_consolidate_t<type_list_merge_sorted<D1, D2, exp_dim_id_less>>, exp_greater_equal>; using type = detail::dim_consolidate_t<type_list_merge_sorted<D1, D2, exp_dim_id_less>>;
}; };
template<Dimension D1, Dimension D2> template<Dimension D1, Dimension D2>

2
test/unit_test/test_dimension.cpp
View File

@ -59,7 +59,7 @@ namespace {
static_assert(std::is_same_v<dimension_multiply_t<dimension<e<0, 1>, e<1, 1>, e<2, 1>>, dimension<e<3, 1>>>, static_assert(std::is_same_v<dimension_multiply_t<dimension<e<0, 1>, e<1, 1>, e<2, 1>>, dimension<e<3, 1>>>,
dimension<e<0, 1>, e<1, 1>, e<2, 1>, e<3, 1>>>); dimension<e<0, 1>, e<1, 1>, e<2, 1>, e<3, 1>>>);
static_assert(std::is_same_v<dimension_multiply_t<dimension<e<0, 1>, e<1, 1>, e<2, 1>>, dimension<e<1, 1>>>, static_assert(std::is_same_v<dimension_multiply_t<dimension<e<0, 1>, e<1, 1>, e<2, 1>>, dimension<e<1, 1>>>,
dimension<e<1, 2>, e<0, 1>, e<2, 1>>>); dimension<e<0, 1>, e<1, 2>, e<2, 1>>>);
static_assert(std::is_same_v<dimension_multiply_t<dimension<e<0, 1>, e<1, 1>, e<2, 1>>, dimension<e<1, -1>>>, static_assert(std::is_same_v<dimension_multiply_t<dimension<e<0, 1>, e<1, 1>, e<2, 1>>, dimension<e<1, -1>>>,
dimension<e<0, 1>, e<2, 1>>>); dimension<e<0, 1>, e<2, 1>>>);