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

Resulting unit ratio fixed in arithmetic operations

Browse Source
This commit is contained in:
Mateusz Pusz
2019-12-11 13:31:40 +01:00
parent c3c80fde11
commit 5a7324596d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/units/quantity.h
View File

@@ -609,7 +609,7 @@ template<typename D1, typename U1, typename Rep1, typename D2, typename U2, type
using dim = dimension_multiply<D1, D2>; using dim = dimension_multiply<D1, D2>;
using ratio1 = ratio_divide<typename U1::ratio, typename dimension_unit<D1>::ratio>; using ratio1 = ratio_divide<typename U1::ratio, typename dimension_unit<D1>::ratio>;
using ratio2 = ratio_divide<typename U2::ratio, typename dimension_unit<D2>::ratio>; using ratio2 = ratio_divide<typename U2::ratio, typename dimension_unit<D2>::ratio>;
using ratio = ratio_multiply<ratio1, ratio2>; using ratio = ratio_multiply<ratio_multiply<ratio1, ratio2>, typename dimension_unit<dim>::ratio>;
using unit = downcast_unit<dim, ratio>; using unit = downcast_unit<dim, ratio>;
using common_rep = decltype(lhs.count() * rhs.count()); using common_rep = decltype(lhs.count() * rhs.count());
using ret = quantity<dim, unit, common_rep>; using ret = quantity<dim, unit, common_rep>;
@@ -664,7 +664,7 @@ template<typename D1, typename U1, typename Rep1, typename D2, typename U2, type
using dim = dimension_divide<D1, D2>; using dim = dimension_divide<D1, D2>;
using ratio1 = ratio_divide<typename U1::ratio, typename dimension_unit<D1>::ratio>; using ratio1 = ratio_divide<typename U1::ratio, typename dimension_unit<D1>::ratio>;
using ratio2 = ratio_divide<typename U2::ratio, typename dimension_unit<D2>::ratio>; using ratio2 = ratio_divide<typename U2::ratio, typename dimension_unit<D2>::ratio>;
using ratio = ratio_divide<ratio1, ratio2>; using ratio = ratio_multiply<ratio_divide<ratio1, ratio2>, typename dimension_unit<dim>::ratio>;
using unit = downcast_unit<dim, ratio>; using unit = downcast_unit<dim, ratio>;
using ret = quantity<dim, unit, common_rep>; using ret = quantity<dim, unit, common_rep>;
return ret(lhs.count() / rhs.count()); return ret(lhs.count() / rhs.count());