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

ratio_text improved to omit den == 1 for exp != 0

Browse Source
This commit is contained in:
Mateusz Pusz
2019-12-29 17:19:55 +01:00
parent e7f37e4e33
commit 159e2c1c02
2 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/units/bits/unit_text.h
+7 -4
View File
@@ -29,21 +29,24 @@ namespace units::detail {
template<typename Ratio>
constexpr auto ratio_text()
{
if constexpr(Ratio::num != 1 || Ratio::den != 1 || Ratio::exp != 0) {
if constexpr(Ratio::num == 1 && Ratio::den == 1 && Ratio::exp != 0) {
return basic_fixed_string("\u00D7 10") + superscript<Ratio::exp>() + basic_fixed_string(" ");
}
else if constexpr(Ratio::num != 1 || Ratio::den != 1 || Ratio::exp != 0) {
auto txt = basic_fixed_string("[") + regular<Ratio::num>();
if constexpr(Ratio::den == 1) {
if constexpr(Ratio::exp == 0) {
return txt + basic_fixed_string("]");
return txt + basic_fixed_string("] ");
}
else {
return txt + basic_fixed_string(" \u00D7 10") + superscript<Ratio::exp>() +
basic_fixed_string("]");
basic_fixed_string("] ");
}
}
else {
return txt + basic_fixed_string("/") + regular<Ratio::den>() +
basic_fixed_string(" \u00D7 10") + superscript<Ratio::exp>() +
basic_fixed_string("]");
basic_fixed_string("] ");
}
}
else {