From a211b6efb6f764b5abec00ff947c9b4891fb757c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Thu, 6 Feb 2020 12:02:47 +0100 Subject: [PATCH] [poincare] Change unit name: hour -> h --- poincare/include/poincare/unit.h | 2 +- poincare/test/simplification.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/poincare/include/poincare/unit.h b/poincare/include/poincare/unit.h index 42a2b8e89..d85c7c3c5 100644 --- a/poincare/include/poincare/unit.h +++ b/poincare/include/poincare/unit.h @@ -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", diff --git a/poincare/test/simplification.cpp b/poincare/test/simplification.cpp index b8f081626..8808bda1e 100644 --- a/poincare/test/simplification.cpp +++ b/poincare/test/simplification.cpp @@ -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");