xo-unit: + quantity / quantity
This commit is contained in:
parent
8f7d60dd21
commit
b028588877
2 changed files with 97 additions and 2 deletions
|
|
@ -106,7 +106,7 @@ namespace xo {
|
|||
};
|
||||
|
||||
struct quantity_util {
|
||||
/* parallel implementation to Quantity<Repr, Int>,
|
||||
/* parallel implementation to Quantity<Repr, Int> multiply,
|
||||
* but return type will have dimension computed at compile-time
|
||||
*/
|
||||
template <typename Q1, typename Q2>
|
||||
|
|
@ -137,9 +137,38 @@ namespace xo {
|
|||
r_int2x_type
|
||||
>(r_scale);
|
||||
}
|
||||
|
||||
template <typename Q1, typename Q2>
|
||||
requires (quantity_concept<Q1>
|
||||
&& quantity_concept<Q2>
|
||||
&& Q1::always_constexpr_unit
|
||||
&& Q2::always_constexpr_unit)
|
||||
static constexpr auto divide(Q1 x, Q2 y) {
|
||||
using r_repr_type = std::common_type_t<typename Q1::repr_type,
|
||||
typename Q2::repr_type>;
|
||||
using r_int_type = std::common_type_t<typename Q1::ratio_int_type,
|
||||
typename Q2::ratio_int_type>;
|
||||
using r_int2x_type = std::common_type_t<typename Q1::ratio_int2x_type,
|
||||
typename Q2::ratio_int2x_type>;
|
||||
|
||||
constexpr auto rr = detail::su_ratio<r_int_type, r_int2x_type>(x.unit(), y.unit());
|
||||
|
||||
r_repr_type r_scale = (((rr.outer_scale_sq_ == 1.0)
|
||||
? 1.0
|
||||
: ::sqrt(rr.outer_scale_sq_))
|
||||
* rr.outer_scale_factor_.template convert_to<r_repr_type>()
|
||||
* static_cast<r_repr_type>(x.scale())
|
||||
/ static_cast<r_repr_type>(y.scale()));
|
||||
|
||||
return quantity<r_repr_type,
|
||||
r_int_type,
|
||||
rr.natural_unit_,
|
||||
r_int2x_type
|
||||
>(r_scale);
|
||||
}
|
||||
};
|
||||
|
||||
/** note: won't have constexpr result until c++26 (when ::sqrt(), ::pow() are constexpr)
|
||||
/** note: won't have constexpr result w/ fractional dimension until c++26 (when ::sqrt(), ::pow() are constexpr)
|
||||
**/
|
||||
template <typename Q1, typename Q2>
|
||||
requires (quantity_concept<Q1>
|
||||
|
|
@ -152,6 +181,19 @@ namespace xo {
|
|||
return quantity_util::multiply(x, y);
|
||||
}
|
||||
|
||||
/** note: won't have constexpr result w/ fractional dimension until c++26 (when ::sqrt(), ::pow() are constexpr)
|
||||
**/
|
||||
template <typename Q1, typename Q2>
|
||||
requires (quantity_concept<Q1>
|
||||
&& quantity_concept<Q2>
|
||||
&& Q1::always_constexpr_unit
|
||||
&& Q2::always_constexpr_unit)
|
||||
constexpr auto
|
||||
operator/ (const Q1 & x, const Q2 & y)
|
||||
{
|
||||
return quantity_util::divide(x, y);
|
||||
}
|
||||
|
||||
namespace qty {
|
||||
// ----- mass -----
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue