From f65b133b373b76007f470b8b882349fb668c8594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Thu, 8 Nov 2018 10:48:08 +0100 Subject: [PATCH] [poincare] use deepReduce instead of reduce --- poincare/src/addition.cpp | 2 +- poincare/src/multiplication.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/poincare/src/addition.cpp b/poincare/src/addition.cpp index e0611efa0..28844a674 100644 --- a/poincare/src/addition.cpp +++ b/poincare/src/addition.cpp @@ -334,7 +334,7 @@ Expression Addition::factorizeOnCommonDenominator(Context & context, Preferences numerator.shallowReduce(context, angleUnit); // Step 5: Simplify the denominator (in case it's a rational number) - inverseDenominator.reduce(context, angleUnit); + inverseDenominator.deepReduce(context, angleUnit); /* Step 6: We simplify the resulting multiplication forbidding any * distribution of multiplication on additions (to avoid an infinite loop). */ diff --git a/poincare/src/multiplication.cpp b/poincare/src/multiplication.cpp index 00aa34ac2..79dcdca70 100644 --- a/poincare/src/multiplication.cpp +++ b/poincare/src/multiplication.cpp @@ -574,7 +574,7 @@ void Multiplication::addMissingFactors(Expression factor, Context & context, Pre * base if any. Otherwise, we add it as an new child. */ for (int i = 0; i < numberOfChildren(); i++) { if (TermsHaveIdenticalBase(childAtIndex(i), factor)) { - Expression sub = Subtraction(CreateExponent(childAtIndex(i)), CreateExponent(factor)).reduce(context, angleUnit); + Expression sub = Subtraction(CreateExponent(childAtIndex(i)), CreateExponent(factor)).deepReduce(context, angleUnit); if (sub.sign() == ExpressionNode::Sign::Negative) { // index[0] < index[1] sub = Opposite(sub); if (factor.type() == ExpressionNode::Type::Power) {