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

refactor: math_concepts usage

Browse Source
This commit is contained in:
Mateusz Pusz
2022-11-06 19:46:58 -10:00
parent 364699e5d9
commit 772fdab6c1
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/include/units/bits/expression_template.h
View File

@@ -24,6 +24,7 @@
#include <units/bits/external/type_list.h> #include <units/bits/external/type_list.h>
#include <units/bits/external/type_traits.h> #include <units/bits/external/type_traits.h>
#include <units/bits/math_concepts.h>
#include <units/ratio.h> #include <units/ratio.h>
namespace units { namespace units {
@@ -65,10 +66,10 @@ template<>
inline constexpr bool valid_ratio<0, 0> = false; inline constexpr bool valid_ratio<0, 0> = false;
template<int Num, int... Den> template<int Num, int... Den>
inline constexpr bool positive_ratio = (Num > 0); inline constexpr bool positive_ratio = gt_zero<Num>;
template<int Num, int Den> template<int Num, int Den>
inline constexpr bool positive_ratio<Num, Den> = (Num * Den > 0); inline constexpr bool positive_ratio<Num, Den> = gt_zero<Num * Den>;
template<int Num, int... Den> template<int Num, int... Den>
inline constexpr bool ratio_one = false; inline constexpr bool ratio_one = false;

4
src/core/include/units/bits/math_concepts.h
View File

@@ -26,10 +26,10 @@
namespace units::detail { namespace units::detail {
template<std::intmax_t N> template<auto N>
concept gt_zero = (N > 0); concept gt_zero = (N > 0);
template<std::intmax_t N> template<auto N>
concept non_zero = (N != 0); concept non_zero = (N != 0);
} // namespace units::detail } // namespace units::detail

8
src/core/include/units/magnitude.h
View File

@@ -26,6 +26,7 @@
#include <units/bits/external/hacks.h> #include <units/bits/external/hacks.h>
#include <units/bits/external/type_name.h> #include <units/bits/external/type_name.h>
#include <units/bits/external/type_traits.h> #include <units/bits/external/type_traits.h>
#include <units/bits/math_concepts.h>
#include <units/bits/prime.h> #include <units/bits/prime.h>
#include <units/ratio.h> #include <units/ratio.h>
#include <concepts> #include <concepts>
@@ -732,7 +733,7 @@ namespace detail {
// Helper to perform prime factorization at compile time. // Helper to perform prime factorization at compile time.
template<std::intmax_t N> template<std::intmax_t N>
requires(N > 0) requires gt_zero<N>
struct prime_factorization { struct prime_factorization {
[[nodiscard]] static consteval std::intmax_t get_or_compute_first_factor() [[nodiscard]] static consteval std::intmax_t get_or_compute_first_factor()
{ {
@@ -767,16 +768,15 @@ inline constexpr auto prime_factorization_v = prime_factorization<N>::value;
* This will be the main way end users create Magnitudes. They should rarely (if ever) create a magnitude<...> by * This will be the main way end users create Magnitudes. They should rarely (if ever) create a magnitude<...> by
* manually adding base powers. * manually adding base powers.
*/ */
template<ratio R> template<ratio R>
requires(R.num > 0) requires detail::gt_zero<R.num>
inline constexpr Magnitude auto mag = detail::prime_factorization_v<R.num> / detail::prime_factorization_v<R.den>; inline constexpr Magnitude auto mag = detail::prime_factorization_v<R.num> / detail::prime_factorization_v<R.den>;
/** /**
* @brief Create a Magnitude which is some rational number raised to a rational power. * @brief Create a Magnitude which is some rational number raised to a rational power.
*/ */
template<ratio Base, ratio Pow> template<ratio Base, ratio Pow>
requires(Base.num > 0) requires detail::gt_zero<Base.num>
inline constexpr Magnitude auto mag_power = pow<Pow>(mag<Base>); inline constexpr Magnitude auto mag_power = pow<Pow>(mag<Base>);
namespace detail { namespace detail {