roland/xo-expression2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-unit: + abbrevs + tests for imperial units {in,ft,yd,mi}

Browse source
This commit is contained in:
Roland Conybeare 2024-05-08 11:02:39 -04:00
commit f4c1ef5ee6
2 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/xo/unit/basis_unit_abbrev.hpp
View file

@ -114,9 +114,21 @@ namespace xo {
return bu_abbrev_type::from_chars("AU");
}
}
if (scalefactor.den() == 10000) {
switch(scalefactor.num()) {
case 3048:
return bu_abbrev_type::from_chars("ft");
case 3*3048:
return bu_abbrev_type::from_chars("yd");
case 5280*3048:
return bu_abbrev_type::from_chars("mi");
}
}
if (scalefactor.num() == 3048 && scalefactor.den() == 120000)
return bu_abbrev_type::from_chars("in");
return fallback_unit_abbrev(scalefactor, dimension::distance);
}

5
utest/basis_unit.test.cpp
View file

@ -111,6 +111,11 @@ namespace xo {
REQUIRE_x2(bu::lightsecond.abbrev() == flatstring("lsec"));
REQUIRE_x2(bu::astronomicalunit.abbrev() == flatstring("AU"));
REQUIRE_x2(bu::inch.abbrev() == flatstring("in"));
REQUIRE_x2(bu::foot.abbrev() == flatstring("ft"));
REQUIRE_x2(bu::yard.abbrev() == flatstring("yd"));
REQUIRE_x2(bu::mile.abbrev() == flatstring("mi"));
log && log(xtag("time", basis_unit2_abbrev(dim::time, scalefactor_ratio_type(1, 1))));
REQUIRE_x2(bu::picosecond.abbrev() == bu_abbrev_type::from_chars("ps"));