UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare] Change unit name: hour -> h

Browse Source
This commit is contained in:
Émilie Feral
2020-02-06 12:02:47 +01:00
committed by Léa Saviot
parent ca50e764a5
commit a211b6efb6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
poincare/include/poincare/unit.h
View File

@@ -231,7 +231,7 @@ public:
Representative("min", "60*_s",
Representative::Prefixable::No,
NoPrefix, NoPrefixCount),
Representative("hour", "60*60*_s",
Representative("h", "60*60*_s",
Representative::Prefixable::No,
NoPrefix, NoPrefixCount),
Representative("day", "24*60*60*_s",

6
poincare/test/simplification.cpp
View File

@@ -1008,12 +1008,12 @@ QUIZ_CASE(poincare_simplification_store_matrix) {
}
QUIZ_CASE(poincare_simplification_unit_convert) {
assert_parsed_expression_simplify_to("10_m/_s→_km/_hour", "36×_km×_hour^\x12-1\x13");
assert_parsed_expression_simplify_to("10_m/_s→_km/_h", "36×_km×_h^\x12-1\x13");
assert_parsed_expression_simplify_to("2_m→_km×_m/_m", "0.002×_km");
assert_parsed_expression_simplify_to("10_m/_s→_km", Undefined::Name());
assert_parsed_expression_simplify_to("10_m/_s→_km/_hour", "36×_km×_hour^\x12-1\x13");
assert_parsed_expression_simplify_to("10_m/_s→_km/_h", "36×_km×_h^\x12-1\x13");
assert_parsed_expression_simplify_to("10_m^2→_mm×_km", "10×_km×_mm");
assert_parsed_expression_simplify_to("2_hour+2_min→_s", "7320×_s");
assert_parsed_expression_simplify_to("2_h+2_min→_s", "7320×_s");
assert_parsed_expression_simplify_to("2×_kg×_m^2×_s^(-2)→_J", "2×_J");
assert_parsed_expression_simplify_to("300000×_m^3→_km^(2.3+0.7)", "0.0003×_km^3");
assert_parsed_expression_simplify_to("3×_m→6_km", "0.003×_km");