From 2db0e5e5da99ccaf2963a9b943645f8c4814d4e2 Mon Sep 17 00:00:00 2001 From: Charlotte THOMAS Date: Tue, 14 Jul 2020 13:31:56 +0200 Subject: [PATCH 1/4] Fix: Changed "IS" to "SI" because even in english the short for "International System of Units" is "SI" --- .../unit_list_controller.cpp | 8 ++++---- apps/calculation/calculation.cpp | 6 +++--- poincare/include/poincare/unit.h | 12 ++++++------ poincare/src/unit.cpp | 18 +++++++++--------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/apps/calculation/additional_outputs/unit_list_controller.cpp b/apps/calculation/additional_outputs/unit_list_controller.cpp index 3c48787adc1..45eb58c4b4f 100644 --- a/apps/calculation/additional_outputs/unit_list_controller.cpp +++ b/apps/calculation/additional_outputs/unit_list_controller.cpp @@ -30,7 +30,7 @@ void UnitListController::setExpression(Poincare::Expression e) { bool requireSimplification = false; bool canChangeUnitPrefix = false; - if (Unit::IsISSpeed(units)) { + if (Unit::IsSISpeed(units)) { // 1.a. Turn speed into km/h m_memoizedExpressions[numberOfMemoizedExpressions++] = UnitConvert::Builder( m_expression.clone(), @@ -43,7 +43,7 @@ void UnitListController::setExpression(Poincare::Expression e) { ) ); requireSimplification = true; // Simplify the conversion - } else if (Unit::IsISVolume(units)) { + } else if (Unit::IsSIVolume(units)) { // 1.b. Turn volume into L m_memoizedExpressions[numberOfMemoizedExpressions++] = UnitConvert::Builder( m_expression.clone(), @@ -51,7 +51,7 @@ void UnitListController::setExpression(Poincare::Expression e) { ); requireSimplification = true; // Simplify the conversion canChangeUnitPrefix = true; // Pick best prefix (mL) - } else if (Unit::IsISEnergy(units)) { + } else if (Unit::IsSIEnergy(units)) { // 1.c. Turn energy into Wh m_memoizedExpressions[numberOfMemoizedExpressions++] = UnitConvert::Builder( m_expression.clone(), @@ -66,7 +66,7 @@ void UnitListController::setExpression(Poincare::Expression e) { ); requireSimplification = true; // Simplify the conversion canChangeUnitPrefix = true; // Pick best prefix (kWh) - } else if (Unit::IsISTime(units)) { + } else if (Unit::IsSITime(units)) { // Turn time into ? year + ? month + ? day + ? h + ? min + ? s double value = Shared::PoincareHelpers::ApproximateToScalar(copy, App::app()->localContext()); m_memoizedExpressions[numberOfMemoizedExpressions++] = Unit::BuildTimeSplit(value, App::app()->localContext(), Preferences::sharedPreferences()->complexFormat(), Preferences::sharedPreferences()->angleUnit()); diff --git a/apps/calculation/calculation.cpp b/apps/calculation/calculation.cpp index 236f59ed007..f44a40c62b2 100644 --- a/apps/calculation/calculation.cpp +++ b/apps/calculation/calculation.cpp @@ -258,13 +258,13 @@ Calculation::AdditionalInformationType Calculation::additionalInformationType(Co Expression unit; PoincareHelpers::Reduce(&o, App::app()->localContext(), ExpressionNode::ReductionTarget::User,ExpressionNode::SymbolicComputation::ReplaceAllSymbolsWithDefinitionsOrUndefined, ExpressionNode::UnitConversion::None); o = o.removeUnit(&unit); - if (Unit::IsIS(unit)) { - if (Unit::IsISSpeed(unit) || Unit::IsISVolume(unit) || Unit::IsISEnergy(unit)) { + if (Unit::IsSI(unit)) { + if (Unit::IsSISpeed(unit) || Unit::IsSIVolume(unit) || Unit::IsSIEnergy(unit)) { /* All these units will provide misc. classic representatives in * addition to the SI unit in additional information. */ return AdditionalInformationType::Unit; } - if (Unit::IsISTime(unit)) { + if (Unit::IsSITime(unit)) { /* If the number of seconds is above 60s, we can write it in the form * of an addition: 23_min + 12_s for instance. */ double value = Shared::PoincareHelpers::ApproximateToScalar(o, App::app()->localContext()); diff --git a/poincare/include/poincare/unit.h b/poincare/include/poincare/unit.h index cb1e5d946e1..1d8a172dd1d 100644 --- a/poincare/include/poincare/unit.h +++ b/poincare/include/poincare/unit.h @@ -767,11 +767,11 @@ class Unit final : public Expression { static Unit Watt() { return Builder(PowerDimension, WattRepresentative, &EmptyPrefix); } static Expression BuildTimeSplit(double seconds, Context * context, Preferences::ComplexFormat complexFormat, Preferences::AngleUnit angleUnit); - static bool IsIS(Expression & e); - static bool IsISSpeed(Expression & e); - static bool IsISVolume(Expression & e); - static bool IsISEnergy(Expression & e); - static bool IsISTime(Expression & e); + static bool IsSI(Expression & e); + static bool IsSISpeed(Expression & e); + static bool IsSIVolume(Expression & e); + static bool IsSIEnergy(Expression & e); + static bool IsSITime(Expression & e); bool isMeter() const; bool isSecond() const; bool isKilogram() const; @@ -791,7 +791,7 @@ class Unit final : public Expression { static constexpr double MonthPerYear = 12.0; static constexpr double DaysPerMonth = DaysPerYear/MonthPerYear; UnitNode * node() const { return static_cast(Expression::node()); } - bool isIS() const; + bool isSI() const; static void ChooseBestMultipleForValue(Expression * units, double * value, bool tuneRepresentative, ExpressionNode::ReductionContext reductionContext); void chooseBestMultipleForValue(double * value, const int exponent, bool tuneRepresentative, ExpressionNode::ReductionContext reductionContext); Expression removeUnit(Expression * unit); diff --git a/poincare/src/unit.cpp b/poincare/src/unit.cpp index b5af7b4958d..bc6cceb180d 100644 --- a/poincare/src/unit.cpp +++ b/poincare/src/unit.cpp @@ -421,7 +421,7 @@ bool Unit::isKilogram() const { return node()->dimension() == MassDimension && node()->representative() == KilogramRepresentative && node()->prefix() == &KiloPrefix; } -bool Unit::isIS() const { +bool Unit::isSI() const { UnitNode * unitNode = node(); const Dimension * dim = unitNode->dimension(); const Representative * rep = unitNode->representative(); @@ -430,12 +430,12 @@ bool Unit::isIS() const { unitNode->prefix() == dim->stdRepresentativePrefix(); } -bool Unit::IsIS(Expression & e) { +bool Unit::IsSI(Expression & e) { if (e.type() == ExpressionNode::Type::Multiplication) { for (int i = 0; i < e.numberOfChildren(); i++) { Expression child = e.childAtIndex(i); assert(child.type() == ExpressionNode::Type::Power || child.type() == ExpressionNode::Type::Unit); - if (!IsIS(child)) { + if (!IsSI(child)) { return false; } } @@ -445,13 +445,13 @@ bool Unit::IsIS(Expression & e) { assert(e.childAtIndex(1).type() == ExpressionNode::Type::Rational && e.childAtIndex(1).convert().isInteger()); Expression child = e.childAtIndex(0); assert(child.type() == ExpressionNode::Type::Unit); - return IsIS(child); + return IsSI(child); } assert(e.type() == ExpressionNode::Type::Unit); - return static_cast(e).isIS(); + return static_cast(e).isSI(); } -bool Unit::IsISSpeed(Expression & e) { +bool Unit::IsSISpeed(Expression & e) { // Form m*s^-1 return e.type() == ExpressionNode::Type::Multiplication && e.numberOfChildren() == 2 && e.childAtIndex(0).type() == ExpressionNode::Type::Unit && e.childAtIndex(0).convert().isMeter() && @@ -460,14 +460,14 @@ bool Unit::IsISSpeed(Expression & e) { e.childAtIndex(1).childAtIndex(0).type() == ExpressionNode::Type::Unit && e.childAtIndex(1).childAtIndex(0).convert().isSecond(); } -bool Unit::IsISVolume(Expression & e) { +bool Unit::IsSIVolume(Expression & e) { // Form m^3 return e.type() == ExpressionNode::Type::Power && e.childAtIndex(0).type() == ExpressionNode::Type::Unit && e.childAtIndex(0).convert().isMeter() && e.childAtIndex(1).type() == ExpressionNode::Type::Rational && e.childAtIndex(1).convert().isThree(); } -bool Unit::IsISEnergy(Expression & e) { +bool Unit::IsSIEnergy(Expression & e) { // Form _kg*_m^2*_s^-2 return e.type() == ExpressionNode::Type::Multiplication && e.numberOfChildren() == 3 && e.childAtIndex(0).type() == ExpressionNode::Type::Unit && e.childAtIndex(0).convert().isKilogram() && @@ -479,7 +479,7 @@ bool Unit::IsISEnergy(Expression & e) { e.childAtIndex(2).childAtIndex(1).type() == ExpressionNode::Type::Rational && e.childAtIndex(2).childAtIndex(1).convert().isMinusTwo(); } -bool Unit::IsISTime(Expression & e) { +bool Unit::IsSITime(Expression & e) { return e.type() == ExpressionNode::Type::Unit && static_cast(e).isSecond(); } From 6f33154c53c73638699ec096ee00643c67660a5f Mon Sep 17 00:00:00 2001 From: Charlotte THOMAS Date: Tue, 14 Jul 2020 13:52:42 +0200 Subject: [PATCH 2/4] Fix: CI test --- apps/calculation/calculation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/calculation/calculation.cpp b/apps/calculation/calculation.cpp index f44a40c62b2..5b39ac7c6a4 100644 --- a/apps/calculation/calculation.cpp +++ b/apps/calculation/calculation.cpp @@ -112,7 +112,7 @@ Layout Calculation::createExactOutputLayout(bool * couldNotCreateExactLayout) { return PoincareHelpers::CreateLayout(exactOutput()); } else { *couldNotCreateExactLayout = true; - return Layout(); + return Layout(); } } From c0a56b00023f0d02c4333a327460500903b55eca Mon Sep 17 00:00:00 2001 From: Charlotte THOMAS Date: Tue, 14 Jul 2020 14:02:35 +0200 Subject: [PATCH 3/4] fix: change IsIS => IsSI in test too --- poincare/test/expression_properties.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/poincare/test/expression_properties.cpp b/poincare/test/expression_properties.cpp index 90b9864270b..c55748011e3 100644 --- a/poincare/test/expression_properties.cpp +++ b/poincare/test/expression_properties.cpp @@ -420,22 +420,22 @@ QUIZ_CASE(poincare_expression_unit_helper) { // 2. Speed Expression meterPerSecond = extract_unit("_m×_s^-1"); - quiz_assert(Unit::IsISSpeed(meterPerSecond)); + quiz_assert(Unit::IsSISpeed(meterPerSecond)); // 3. Volume Expression meter3 = extract_unit("_m^3"); - quiz_assert(Unit::IsISVolume(meter3)); + quiz_assert(Unit::IsSIVolume(meter3)); // 4. Energy Expression kilogramMeter2PerSecond2 = extract_unit("_kg×_m^2×_s^-2"); - quiz_assert(Unit::IsISEnergy(kilogramMeter2PerSecond2)); + quiz_assert(Unit::IsSIEnergy(kilogramMeter2PerSecond2)); Expression kilogramMeter3PerSecond2 = extract_unit("_kg×_m^3×_s^-2"); - quiz_assert(!Unit::IsISEnergy(kilogramMeter3PerSecond2)); + quiz_assert(!Unit::IsSIEnergy(kilogramMeter3PerSecond2)); // 5. International System - quiz_assert(Unit::IsIS(kilogramMeter2PerSecond2)); - quiz_assert(Unit::IsIS(meter3)); - quiz_assert(Unit::IsIS(meterPerSecond)); + quiz_assert(Unit::IsSI(kilogramMeter2PerSecond2)); + quiz_assert(Unit::IsSI(meter3)); + quiz_assert(Unit::IsSI(meterPerSecond)); Expression joule = extract_unit("_J"); - quiz_assert(!Unit::IsIS(joule)); + quiz_assert(!Unit::IsSI(joule)); } From 4dfe9fd3ba5eb5b11cb00904330686a3094d1999 Mon Sep 17 00:00:00 2001 From: Charlotte THOMAS Date: Tue, 14 Jul 2020 16:17:50 +0200 Subject: [PATCH 4/4] Update calculation.cpp removed white --- apps/calculation/calculation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/calculation/calculation.cpp b/apps/calculation/calculation.cpp index 5b39ac7c6a4..f44a40c62b2 100644 --- a/apps/calculation/calculation.cpp +++ b/apps/calculation/calculation.cpp @@ -112,7 +112,7 @@ Layout Calculation::createExactOutputLayout(bool * couldNotCreateExactLayout) { return PoincareHelpers::CreateLayout(exactOutput()); } else { *couldNotCreateExactLayout = true; - return Layout(); + return Layout(); } }