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

math_test enabled

Browse Source
This commit is contained in:
Mateusz Pusz
2019-12-06 12:56:44 +01:00
parent 71eec182f9
commit 33f14f39f3
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/units/derived_dimension.h
+6 -1
View File
@@ -408,8 +408,13 @@ struct dimension_pow_impl<D, N> {
using type = downcast<derived_dimension<exp<D, N>>>;
};
template<BaseDimension D>
struct dimension_pow_impl<D, 1> {
using type = D;
};
template<BaseDimension D, std::size_t N>
struct dimension_pow_impl<exp<D, 1, N>, N> {
struct dimension_pow_impl<derived_dimension<exp<D, 1, N>>, N> {
using type = D;
};
src/include/units/math.h
+7 -5
View File
@@ -38,16 +38,18 @@ namespace units {
inline Quantity AUTO pow(const quantity<D, U, Rep>& q) noexcept
{
using dim = dimension_pow<D, N>;
using r = ratio_pow<typename U::ratio, N>;
return quantity<dim, downcast<scaled_unit<typename dim::coherent_unit::reference, r>>, Rep>(static_cast<Rep>(std::pow(q.count(), N)));
using ratio = ratio_pow<typename U::ratio, N>;
using unit = detail::unit_for_dimension<dim, ratio>;
return quantity<dim, unit, Rep>(static_cast<Rep>(std::pow(q.count(), N)));
}
template<typename D, typename U, typename Rep>
inline Quantity AUTO sqrt(const quantity<D, U, Rep>& q) noexcept
{
using dim = dimension_sqrt<typename U::dimension>;
using r = ratio_sqrt<typename U::ratio>;
return quantity<dim, downcast<scaled_unit<typename dim::coherent_unit::reference, r>>, Rep>(static_cast<Rep>(std::sqrt(q.count())));
using dim = dimension_sqrt<D>;
using ratio = ratio_sqrt<typename U::ratio>;
using unit = detail::unit_for_dimension<dim, ratio>;
return quantity<dim, unit, Rep>(static_cast<Rep>(std::sqrt(q.count())));
}
} // namespace units