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/unit] Change temperature symbols

Browse Source 
Celsius and Fahrenheit now use the degree symbol °.
  _Cel -> _°C
  _Fah -> _°F

Change-Id: Ic5935d3a6263a556692bebb6254b6b6d4de48431
This commit is contained in:
Gabriel Ozouf
2020-09-18 16:04:34 +02:00
committed by Émilie Feral
parent 67e6e38825
commit 3f19d66c78
4 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/shared.universal.i18n
View File

@@ -35,8 +35,8 @@ UnitCurrentAmpereSymbol = "_A"
UnitCurrentAmpereMilliSymbol = "_mA"
UnitCurrentAmpereMicroSymbol = "_μA"
UnitTemperatureKelvinSymbol = "_K"
UnitTemperatureCelsiusSymbol = "_Cel"
UnitTemperatureFahrenheitSymbol = "_Fah"
UnitTemperatureCelsiusSymbol = "_°C"
UnitTemperatureFahrenheitSymbol = "_°F"
UnitAmountMoleSymbol = "_mol"
UnitAmountMoleMilliSymbol = "_mmol"
UnitAmountMoleMicroSymbol = "_μmol"

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

@@ -550,8 +550,8 @@ public:
typedef UnitNode::TemperatureRepresentative TemperatureRepresentative;
static constexpr const TemperatureRepresentative k_temperatureRepresentatives[] = {
TemperatureRepresentative("K", 1., Prefixable::All, Prefixable::None),
TemperatureRepresentative("Cel", 1., Prefixable::None, Prefixable::None),
TemperatureRepresentative("Fah", 5./9., Prefixable::None, Prefixable::None),
TemperatureRepresentative("°C", 1., Prefixable::None, Prefixable::None),
TemperatureRepresentative("°F", 5./9., Prefixable::None, Prefixable::None),
};
typedef UnitNode::AmountOfSubstanceRepresentative AmountOfSubstanceRepresentative;
static constexpr const AmountOfSubstanceRepresentative k_amountOfSubstanceRepresentatives[] = { AmountOfSubstanceRepresentative("mol", 1., Prefixable::All, Prefixable::LongScale) };
@@ -647,9 +647,9 @@ public:
static constexpr int k_kelvinRepresentativeIndex = 0;
static_assert(strings_equal(k_temperatureRepresentatives[k_kelvinRepresentativeIndex].m_rootSymbol, "K"), "Index for the Kelvin Representative is incorrect.");
static constexpr int k_celsiusRepresentativeIndex = 1;
static_assert(strings_equal(k_temperatureRepresentatives[k_celsiusRepresentativeIndex].m_rootSymbol, "Cel"), "Index for the Celsius Representative is incorrect.");
static_assert(strings_equal(k_temperatureRepresentatives[k_celsiusRepresentativeIndex].m_rootSymbol, "°C"), "Index for the Celsius Representative is incorrect.");
static constexpr int k_fahrenheitRepresentativeIndex = 2;
static_assert(strings_equal(k_temperatureRepresentatives[k_fahrenheitRepresentativeIndex].m_rootSymbol, "Fah"), "Index for the Fahrenheit Representative is incorrect.");
static_assert(strings_equal(k_temperatureRepresentatives[k_fahrenheitRepresentativeIndex].m_rootSymbol, "°F"), "Index for the Fahrenheit Representative is incorrect.");
static constexpr int k_electronVoltRepresentativeIndex = 1;
static_assert(strings_equal(k_energyRepresentatives[k_electronVoltRepresentativeIndex].m_rootSymbol, "eV"), "Index for the Electron Volt Representative is incorrect.");
static constexpr int k_wattRepresentativeIndex = 0;

12
poincare/test/expression_properties.cpp
View File

@@ -403,14 +403,14 @@ QUIZ_CASE(poincare_expression_additional_results) {
assert_additional_results_compute_to("1×_kg", nullptr, 0, Metric);
// Temperatures
const char * array14[2] = {"-273.15×_Cel", "-459.67×_Fah"};
const char * array14[2] = {"-273.15×_°C", "-459.67×_°F"};
assert_additional_results_compute_to("0×_K", array14, 2, Metric);
const char * array15[2] = {"-279.67×_Fah", "-173.15×_Cel"};
const char * array15[2] = {"-279.67×_°F", "-173.15×_°C"};
assert_additional_results_compute_to("100×_K", array15, 2, Imperial);
const char * array16[2] = {"12.02×_Fah", "262.05×_K"};
assert_additional_results_compute_to("-11.1×_Cel", array16, 2);
const char * array17[2] = {"-20×_Cel", "253.15×_K"};
assert_additional_results_compute_to("-4×_Fah", array17, 2);
const char * array16[2] = {"12.02×_°F", "262.05×_K"};
assert_additional_results_compute_to("-11.1×_°C", array16, 2);
const char * array17[2] = {"-20×_°C", "253.15×_K"};
assert_additional_results_compute_to("-4×_°F", array17, 2);
// Energy
const char * array8[2] = {"1×_kW×_h", "2.246943ᴇ13×_TeV"};

40
poincare/test/simplification.cpp
View File

@@ -309,8 +309,8 @@ QUIZ_CASE(poincare_simplification_units) {
assert_parsed_expression_simplify_to("_shtn", "1×_shtn", User, Radian, Imperial);
assert_parsed_unit_simplify_to_with_prefixes(Unit::k_currentRepresentatives);
assert_parsed_unit_simplify_to_with_prefixes(Unit::k_temperatureRepresentatives);
assert_parsed_expression_simplify_to("_Cel", "1×_Cel");
assert_parsed_expression_simplify_to("_Fah", "1×_Fah");
assert_parsed_expression_simplify_to("_°C", "1×_°C");
assert_parsed_expression_simplify_to("_°F", "1×_°F");
assert_parsed_unit_simplify_to_with_prefixes(Unit::k_amountOfSubstanceRepresentatives);
assert_parsed_unit_simplify_to_with_prefixes(Unit::k_luminousIntensityRepresentatives);
assert_parsed_unit_simplify_to_with_prefixes(Unit::k_forceRepresentatives);
@@ -347,19 +347,19 @@ QUIZ_CASE(poincare_simplification_units) {
assert_parsed_expression_simplify_to("1_qt", "946.352946×_cm^3");
/* Tests for non-absolute units */
assert_parsed_expression_simplify_to("273.15×_K→_Cel", "0×_Cel");
assert_parsed_expression_simplify_to("0×_Cel", "0×_Cel");
assert_parsed_expression_simplify_to("-32×_Fah", "-32×_Fah");
assert_parsed_expression_simplify_to("273.15×_K→_°C", "0×_°C");
assert_parsed_expression_simplify_to("0×_°C", "0×_°C");
assert_parsed_expression_simplify_to("-32×_°F", "-32×_°F");
assert_parsed_expression_simplify_to("273.16×_K", "273.16×_K");
assert_parsed_expression_simplify_to("100×_Cel→_K", "373.15×_K");
assert_parsed_expression_simplify_to("-100×_Cel→_K", "173.15×_K");
assert_parsed_expression_simplify_to("_Cel+_Cel", Undefined::Name());
assert_parsed_expression_simplify_to("_Cel+_Fah", Undefined::Name());
assert_parsed_expression_simplify_to("_K+_Fah", Undefined::Name());
assert_parsed_expression_simplify_to("2*20_Fah", Undefined::Name());
assert_parsed_expression_simplify_to("_Cel^2", Undefined::Name());
assert_parsed_expression_simplify_to("1/(-3_Cel)", Undefined::Name());
assert_parsed_expression_simplify_to("-1×100×_Cel→_K", Undefined::Name());
assert_parsed_expression_simplify_to("100×_°C→_K", "373.15×_K");
assert_parsed_expression_simplify_to("-100×_°C→_K", "173.15×_K");
assert_parsed_expression_simplify_to("_°C+_°C", Undefined::Name());
assert_parsed_expression_simplify_to("_°C+_°F", Undefined::Name());
assert_parsed_expression_simplify_to("_K+_°F", Undefined::Name());
assert_parsed_expression_simplify_to("2*20_°F", Undefined::Name());
assert_parsed_expression_simplify_to("_°C^2", Undefined::Name());
assert_parsed_expression_simplify_to("1/(-3_°C)", Undefined::Name());
assert_parsed_expression_simplify_to("-1×100×_°C→_K", Undefined::Name());
/* Unit sum/subtract */
assert_parsed_expression_simplify_to("_m+_m", "2×_m");
@@ -1222,12 +1222,12 @@ QUIZ_CASE(poincare_simplification_unit_convert) {
assert_parsed_expression_simplify_to("4→_km/_m", Undefined::Name());
assert_parsed_expression_simplify_to("3×_min→_s+1-1", Undefined::Name());
assert_parsed_expression_simplify_to("0_K→_Cel", "-273.15×_Cel");
assert_parsed_expression_simplify_to("0_Cel→_K", "273.15×_K");
assert_parsed_expression_simplify_to("_Cel→_K", "274.15×_K");
assert_parsed_expression_simplify_to("0_K→_Fah", "-459.67×_Fah");
assert_parsed_expression_simplify_to("0_Fah→_K", "255.37222222222×_K");
assert_parsed_expression_simplify_to("_Fah→_K", "255.92777777778×_K");
assert_parsed_expression_simplify_to("0_K→_°C", "-273.15×_°C");
assert_parsed_expression_simplify_to("0_°C→_K", "273.15×_K");
assert_parsed_expression_simplify_to("_°C→_K", "274.15×_K");
assert_parsed_expression_simplify_to("0_K→_°F", "-459.67×_°F");
assert_parsed_expression_simplify_to("0_°F→_K", "255.37222222222×_K");
assert_parsed_expression_simplify_to("_°F→_K", "255.92777777778×_K");
assert_reduce("_m→a", Radian, Metric, Real);
assert_reduce("_m→b", Radian, Metric, Real);