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

fix: Added a special case for multiplication of opposite magnitude exponents

Browse Source
This commit is contained in:
Mateusz Pusz
2022-10-20 14:05:20 +02:00
parent 0b9b159695
commit 5a7f58be41
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -588,13 +588,17 @@ constexpr Magnitude auto operator*(magnitude<H1, T1...>, magnitude<H2, T2...>)
constexpr auto partial_product = magnitude<T1...>{} * magnitude<T2...>{}; constexpr auto partial_product = magnitude<T1...>{} * magnitude<T2...>{};
if constexpr (is_same_v<decltype(get_base(H1)), decltype(get_base(H2))>) { if constexpr (is_same_v<decltype(get_base(H1)), decltype(get_base(H2))>) {
// Make a new power_v with the common base of H1 and H2, whose power is their powers' sum. if constexpr (get_exponent(H1) + get_exponent(H2) == 0) {
constexpr auto new_head = power_v_or_T<get_base(H1), get_exponent(H1) + get_exponent(H2)>(); return magnitude<1>{};
if constexpr (get_exponent(new_head) == 0) {
return partial_product;
} else { } else {
return magnitude<new_head>{} * partial_product; // Make a new power_v with the common base of H1 and H2, whose power is their powers' sum.
constexpr auto new_head = power_v_or_T<get_base(H1), get_exponent(H1) + get_exponent(H2)>();
if constexpr (get_exponent(new_head) == 0) {
return partial_product;
} else {
return magnitude<new_head>{} * partial_product;
}
} }
} else if constexpr (is_named_magnitude<decltype(get_base(H1))>) { } else if constexpr (is_named_magnitude<decltype(get_base(H1))>) {
return magnitude<H1>{} * (magnitude<T1...>{} * magnitude<H2, T2...>{}); return magnitude<H1>{} * (magnitude<T1...>{} * magnitude<H2, T2...>{});