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

feat: fractional exponents support added to mag_power

Browse Source
This commit is contained in:
Mateusz Pusz
2024-10-03 10:25:23 +02:00
parent f3e1ace5f6
commit 1a8a386460
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/include/mp-units/framework/magnitude.h
View File

@@ -248,7 +248,7 @@ template<auto M>
template<auto M> template<auto M>
[[nodiscard]] consteval auto remove_positive_power(magnitude<M> m); [[nodiscard]] consteval auto remove_positive_power(magnitude<M> m);
template<std::intmax_t Base, std::intmax_t Pow> template<std::intmax_t Base, int Num, int Den = 1>
requires detail::gt_zero<Base> requires detail::gt_zero<Base>
[[nodiscard]] consteval Magnitude auto mag_power_lazy(); [[nodiscard]] consteval Magnitude auto mag_power_lazy();
@@ -409,7 +409,7 @@ struct magnitude : detail::magnitude_base<magnitude<Ms...>> {
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Magnitude rational powers implementation. // Magnitude rational powers implementation.
template<std::intmax_t Num, std::intmax_t Den = 1> template<int Num, int Den = 1>
[[nodiscard]] friend consteval auto pow(magnitude) [[nodiscard]] friend consteval auto pow(magnitude)
{ {
if constexpr (Num == 0) { if constexpr (Num == 0) {
@@ -605,9 +605,9 @@ constexpr Magnitude auto mag_ratio = detail::prime_factorization_v<N> / detail::
/** /**
* @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<std::intmax_t Base, std::intmax_t Pow> template<std::intmax_t Base, int Num, int Den = 1>
requires detail::gt_zero<Base> requires detail::gt_zero<Base>
constexpr Magnitude auto mag_power = pow<Pow>(mag<Base>); constexpr Magnitude auto mag_power = pow<Num, Den>(mag<Base>);
/** /**
* @brief A convenient Magnitude constant for pi, which we can manipulate like a regular number. * @brief A convenient Magnitude constant for pi, which we can manipulate like a regular number.
@@ -627,11 +627,11 @@ MP_UNITS_EXPORT_END
namespace detail { namespace detail {
// This is introduced to break the dependency cycle between `magnitude::_magnitude_text` and `prime_factorization` // This is introduced to break the dependency cycle between `magnitude::_magnitude_text` and `prime_factorization`
template<std::intmax_t Base, std::intmax_t Pow> template<std::intmax_t Base, int Num, int Den>
requires detail::gt_zero<Base> requires detail::gt_zero<Base>
[[nodiscard]] consteval Magnitude auto mag_power_lazy() [[nodiscard]] consteval Magnitude auto mag_power_lazy()
{ {
return pow<Pow>(mag<Base>); return pow<Num, Den>(mag<Base>);
} }
} // namespace detail } // namespace detail