From 05a42cd2eb1f7de3f604af5081fccd0a7c1acb72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Thu, 7 May 2020 13:46:24 +0200
Subject: [PATCH] [apps/shared] PoincareHelpers: implement Reduce static inline
 function

---
 .../additional_outputs/unit_list_controller.cpp   | 15 ++++++++-------
 apps/calculation/calculation.cpp                  | 10 ++--------
 apps/shared/poincare_helpers.h                    |  7 +++++++
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/apps/calculation/additional_outputs/unit_list_controller.cpp b/apps/calculation/additional_outputs/unit_list_controller.cpp
index c8f654e10..e60800d11 100644
--- a/apps/calculation/additional_outputs/unit_list_controller.cpp
+++ b/apps/calculation/additional_outputs/unit_list_controller.cpp
@@ -8,6 +8,7 @@
 #include <poincare/unit.h>
 
 using namespace Poincare;
+using namespace Shared;
 
 namespace Calculation {
 
@@ -22,16 +23,10 @@ void UnitListController::setExpression(Poincare::Expression e) {
 
   size_t numberOfMemoizedExpressions = 0;
   // 1. First rows: miscellaneous classic units for some dimensions
-  ExpressionNode::ReductionContext reductionContext(
-      App::app()->localContext(),
-      Preferences::sharedPreferences()->complexFormat(),
-      Preferences::sharedPreferences()->angleUnit(),
-      ExpressionNode::ReductionTarget::User,
-      ExpressionNode::SymbolicComputation::ReplaceAllSymbolsWithDefinitionsOrUndefined);
   Expression copy = m_expression.clone();
   Expression units;
   // Reduce to be able to recognize units
-  copy = copy.reduce(reductionContext);
+  PoincareHelpers::Reduce(&copy, App::app()->localContext(), ExpressionNode::ReductionTarget::User);
   copy = copy.removeUnit(&units);
   bool requireSimplification = false;
   bool canChangeUnitPrefix = false;
@@ -88,6 +83,12 @@ void UnitListController::setExpression(Poincare::Expression e) {
       Expression newUnits;
       m_memoizedExpressions[currentExpressionIndex] = m_memoizedExpressions[currentExpressionIndex].removeUnit(&newUnits);
       double value = Shared::PoincareHelpers::ApproximateToScalar<double>(m_memoizedExpressions[currentExpressionIndex], App::app()->localContext());
+      ExpressionNode::ReductionContext reductionContext(
+          App::app()->localContext(),
+          Preferences::sharedPreferences()->complexFormat(),
+          Preferences::sharedPreferences()->angleUnit(),
+          ExpressionNode::ReductionTarget::User,
+          ExpressionNode::SymbolicComputation::ReplaceAllSymbolsWithDefinitionsOrUndefined);
       Unit::ChooseBestPrefixForValue(&newUnits, &value, reductionContext);
       m_memoizedExpressions[currentExpressionIndex] = Multiplication::Builder(Number::FloatNumber(value), newUnits);
     }
diff --git a/apps/calculation/calculation.cpp b/apps/calculation/calculation.cpp
index 603c89dd5..ca69ca7ce 100644
--- a/apps/calculation/calculation.cpp
+++ b/apps/calculation/calculation.cpp
@@ -254,14 +254,8 @@ Calculation::AdditionalInformationType Calculation::additionalInformationType(Co
   }
   if (o.hasUnit()) {
     Expression unit;
-    ExpressionNode::ReductionContext reductionContext(
-        App::app()->localContext(),
-        Preferences::sharedPreferences()->complexFormat(),
-        Preferences::sharedPreferences()->angleUnit(),
-        ExpressionNode::ReductionTarget::User,
-        ExpressionNode::SymbolicComputation::ReplaceAllSymbolsWithDefinitionsOrUndefined,
-        ExpressionNode::UnitConversion::None);
-    o = o.reduce(reductionContext).removeUnit(&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)) {
         /* All these units will provide misc. classic representatives in
diff --git a/apps/shared/poincare_helpers.h b/apps/shared/poincare_helpers.h
index d2124de32..774547e17 100644
--- a/apps/shared/poincare_helpers.h
+++ b/apps/shared/poincare_helpers.h
@@ -69,6 +69,13 @@ inline void Simplify(Poincare::Expression * e, Poincare::Context * context, Poin
   *e = e->simplify(Poincare::ExpressionNode::ReductionContext(context, complexFormat, preferences->angleUnit(), target, symbolicComputation, unitConversion));
 }
 
+inline void Reduce(Poincare::Expression * e, Poincare::Context * context, Poincare::ExpressionNode::ReductionTarget target, Poincare::ExpressionNode::SymbolicComputation symbolicComputation = Poincare::ExpressionNode::SymbolicComputation::ReplaceAllDefinedSymbolsWithDefinition, Poincare::ExpressionNode::UnitConversion unitConversion = Poincare::ExpressionNode::UnitConversion::Default) {
+  Poincare::Preferences * preferences = Poincare::Preferences::sharedPreferences();
+  Poincare::Preferences::ComplexFormat complexFormat = Poincare::Expression::UpdatedComplexFormatWithExpressionInput(preferences->complexFormat(), *e, context);
+
+  *e = e->reduce(Poincare::ExpressionNode::ReductionContext(context, complexFormat, preferences->angleUnit(), target, symbolicComputation, unitConversion));
+}
+
 inline void ParseAndSimplifyAndApproximate(const char * text, Poincare::Expression * simplifiedExpression, Poincare::Expression * approximateExpression, Poincare::Context * context, Poincare::ExpressionNode::SymbolicComputation symbolicComputation = Poincare::ExpressionNode::SymbolicComputation::ReplaceAllDefinedSymbolsWithDefinition) {
   Poincare::Preferences * preferences = Poincare::Preferences::sharedPreferences();
   Poincare::Preferences::ComplexFormat complexFormat = Poincare::Expression::UpdatedComplexFormatWithTextInput(preferences->complexFormat(), text);