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

More refactoring

Browse Source 
- unknown_unit and unknown_dimension added
- the support for remaining SI units added
This commit is contained in:
Mateusz Pusz committed 2019-12-07 16:30:40 +01:00
1 parent 33f14f39f3
commit 22eda11bea
40 files changed
+1094 -953
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/include/units/quantity.h
+12 -10
View File
@@ -23,7 +23,7 @@
#pragma once
#include <units/concepts.h>
#include <units/unit.h>
#include <units/dimension_op.h>
#include <limits>
#include <ostream>
@@ -73,9 +73,7 @@ struct common_quantity_impl<quantity<D, U, Rep1>, quantity<D, U, Rep2>, Rep> {
template<typename D, typename U1, typename Rep1, typename U2, typename Rep2, typename Rep>
struct common_quantity_impl<quantity<D, U1, Rep1>, quantity<D, U2, Rep2>, Rep> {
using type = quantity<
D, downcast<scaled_unit<typename U1::reference, common_ratio<typename U1::ratio, typename U2::ratio>>>,
Rep>;
using type = quantity<D, downcast_unit<D, common_ratio<typename U1::ratio, typename U2::ratio>>, Rep>;
};
} // namespace detail
@@ -154,7 +152,7 @@ template<Quantity To, typename D, typename U, typename Rep>
{
using c_ratio = ratio_divide<typename U::ratio, typename To::unit::ratio>;
using c_rep = std::common_type_t<typename To::rep, Rep, intmax_t>;
using ret_unit = downcast<scaled_unit<typename U::reference, typename To::unit::ratio>>;
using ret_unit = downcast_unit<D, typename To::unit::ratio>;
using ret = quantity<D, ret_unit, typename To::rep>;
using cast = detail::quantity_cast_impl<ret, c_ratio, c_rep, c_ratio::num == 1, c_ratio::den == 1>;
return cast::cast(q);
@@ -465,8 +463,10 @@ template<typename D1, typename U1, typename Rep1, typename D2, typename U2, type
detail::basic_arithmetic<Rep1, Rep2>
{
using dim = dimension_multiply<D1, D2>;
using ratio = ratio_multiply<typename U1::ratio, typename U2::ratio>;
using unit = detail::unit_for_dimension<dim, ratio>;
using ratio1 = ratio_divide<typename U1::ratio, typename D1::coherent_unit::ratio>;
using ratio2 = ratio_divide<typename U2::ratio, typename D2::coherent_unit::ratio>;
using ratio = ratio_multiply<ratio1, ratio2>;
using unit = downcast_unit<dim, ratio>;
using common_rep = decltype(lhs.count() * rhs.count());
using ret = quantity<dim, unit, common_rep>;
return ret(lhs.count() * rhs.count());
@@ -480,7 +480,7 @@ template<typename D, Scalar Value, typename U, typename Rep>
using dim = dim_invert<D>;
using ratio = ratio<U::ratio::den, U::ratio::num>;
using unit = detail::unit_for_dimension<dim, ratio>;
using unit = downcast_unit<dim, ratio>;
using common_rep = decltype(v / q.count());
using ret = quantity<dim, unit, common_rep>;
return ret(v / q.count());
@@ -518,8 +518,10 @@ template<typename D1, typename U1, typename Rep1, typename D2, typename U2, type
using common_rep = decltype(lhs.count() / rhs.count());
using dim = dimension_divide<D1, D2>;
using ratio = ratio_divide<typename U1::ratio, typename U2::ratio>;
using unit = detail::unit_for_dimension<dim, ratio>;
using ratio1 = ratio_divide<typename U1::ratio, typename D1::coherent_unit::ratio>;
using ratio2 = ratio_divide<typename U2::ratio, typename D2::coherent_unit::ratio>;
using ratio = ratio_divide<ratio1, ratio2>;
using unit = downcast_unit<dim, ratio>;
using ret = quantity<dim, unit, common_rep>;
return ret(lhs.count() / rhs.count());
}