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

Fractional dimension exponents support added

Browse Source
This commit is contained in:
Mateusz Pusz
2019-09-10 21:20:32 +02:00
parent 8587d5350d
commit bce17a8476
5 changed files with 95 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/units/dimension.h
+19 -11
View File
@@ -24,6 +24,8 @@
#include <units/bits/type_list.h>
#include <units/bits/downcasting.h>
#include <units/ratio.h>
#include <ratio>
namespace std::experimental::units {
@@ -60,10 +62,11 @@ namespace std::experimental::units {
// exp
template<const base_dimension& BaseDimension, int Value>
template<const base_dimension& BaseDimension, int Num, int Den = 1>
struct exp {
static constexpr const base_dimension& dimension = BaseDimension;
static constexpr int value = Value;
static constexpr int num = Num;
static constexpr int den = Den;
};
// is_exp
@@ -71,8 +74,8 @@ namespace std::experimental::units {
template<typename T>
inline constexpr bool is_exp = false;
template<const base_dimension& BaseDimension, int Value>
inline constexpr bool is_exp<exp<BaseDimension, Value>> = true;
template<const base_dimension& BaseDimension, int Num, int Den>
inline constexpr bool is_exp<exp<BaseDimension, Num, Den>> = true;
} // namespace detail
template<typename T>
@@ -89,9 +92,9 @@ namespace std::experimental::units {
template<Exponent E>
struct exp_invert;
template<const base_dimension& BaseDimension, int Value>
struct exp_invert<exp<BaseDimension, Value>> {
using type = exp<BaseDimension, -Value>;
template<const base_dimension& BaseDimension, int Num, int Den>
struct exp_invert<exp<BaseDimension, Num, Den>> {
using type = exp<BaseDimension, -Num, Den>;
};
template<Exponent E>
@@ -131,6 +134,7 @@ namespace std::experimental::units {
using dim_invert_t = dim_invert<typename D::base_type>::type;
// todo: force as the only user interface to create dimensions through modules
// make_dimension
namespace detail {
@@ -157,10 +161,14 @@ namespace std::experimental::units {
using type = conditional<std::is_same_v<rest, dimension<>>, dimension<E1>, type_list_push_front<rest, E1>>;
};
template<const base_dimension& D, int V1, int V2, typename... ERest>
struct dim_consolidate<dimension<exp<D, V1>, exp<D, V2>, ERest...>> {
using type = conditional<V1 + V2 == 0, dim_consolidate_t<dimension<ERest...>>,
dim_consolidate_t<dimension<exp<D, V1 + V2>, ERest...>>>;
template<const base_dimension& D, int Num1, int Den1, int Num2, int Den2, typename... ERest>
struct dim_consolidate<dimension<exp<D, Num1, Den1>, exp<D, Num2, Den2>, ERest...>> {
// todo: provide custom implementation for ratio_add
using r1 = std::ratio<Num1, Den1>;
using r2 = std::ratio<Num2, Den2>;
using r = std::ratio_add<r1, r2>;
using type = conditional<r::num == 0, dim_consolidate_t<dimension<ERest...>>,
dim_consolidate_t<dimension<exp<D, r::num, r::den>, ERest...>>>;
};
} // namespace detail
src/include/units/unit.h
+8 -8
View File
@@ -78,20 +78,20 @@ namespace std::experimental::units {
typename get_ratio<BaseDimension, Rest...>::ratio>;
};
template<typename Result, int UnitExpValue, typename UnitRatio>
template<typename Result, int UnitExpNum, int UnitExpDen, typename UnitRatio>
struct ratio_op;
template<typename Result, typename UnitRatio>
struct ratio_op<Result, 0, UnitRatio> {
template<typename Result, int UnitExpDen, typename UnitRatio>
struct ratio_op<Result, 0, UnitExpDen, UnitRatio> {
using ratio = Result;
};
template<typename Result, int UnitExpValue, typename UnitRatio>
template<typename Result, int UnitExpNum, int UnitExpDen, typename UnitRatio>
struct ratio_op {
using calc_ratio = conditional<(UnitExpValue > 0), ratio_multiply<Result, UnitRatio>,
using calc_ratio = conditional<(UnitExpNum * UnitExpDen > 0), ratio_multiply<Result, UnitRatio>,
ratio_divide<Result, UnitRatio>>;
static constexpr int value = UnitExpValue > 0 ? UnitExpValue - 1 : UnitExpValue + 1;
using ratio = ratio_op<calc_ratio, value, UnitRatio>::ratio;
static constexpr int value = (UnitExpNum * UnitExpDen > 0) ? (UnitExpNum - UnitExpDen) : (UnitExpNum + UnitExpDen);
using ratio = ratio_op<calc_ratio, value, UnitExpDen, UnitRatio>::ratio;
};
template<typename D, typename... Us>
@@ -106,7 +106,7 @@ namespace std::experimental::units {
struct derived_ratio<dimension<E, Rest...>, Us...> {
using rest_ratio = derived_ratio<dimension<Rest...>, Us...>::ratio;
using e_ratio = get_ratio<E::dimension, Us...>::ratio;
using ratio = ratio_op<rest_ratio, E::value, e_ratio>::ratio;
using ratio = ratio_op<rest_ratio, E::num, E::den, e_ratio>::ratio;
};
}