From 94334169f0d8fa0fa353876b0b88c39338cb2cbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Wed, 5 Feb 2020 11:27:05 +0100 Subject: [PATCH] [poincare/expr] Remove beautifiedExpHasUnits and reducedExpIsUnitsOnly --- poincare/include/poincare/expression.h | 2 -- poincare/include/poincare/expression_node.h | 2 -- poincare/include/poincare/multiplication.h | 2 -- poincare/include/poincare/power.h | 2 -- poincare/include/poincare/unit.h | 2 -- poincare/src/multiplication.cpp | 10 ---------- poincare/src/power.cpp | 4 ---- 7 files changed, 24 deletions(-) diff --git a/poincare/include/poincare/expression.h b/poincare/include/poincare/expression.h index 1b9522b57..ca767f68c 100644 --- a/poincare/include/poincare/expression.h +++ b/poincare/include/poincare/expression.h @@ -197,7 +197,6 @@ public: static constexpr int k_maxNumberOfPolynomialCoefficients = k_maxPolynomialDegree+1; int getPolynomialReducedCoefficients(const char * symbolName, Expression coefficients[], Context * context, Preferences::ComplexFormat complexFormat, Preferences::AngleUnit angleUnit, ExpressionNode::SymbolicComputation symbolicComputation) const; Expression replaceSymbolWithExpression(const SymbolAbstract & symbol, const Expression & expression) { return node()->replaceSymbolWithExpression(symbol, expression); } - bool beautifiedExpressionHasUnits() const { return node()->beautifiedExpressionHasUnits(); } // This must be called on a beautified expression /* Complex */ static bool EncounteredComplex(); @@ -397,7 +396,6 @@ private: /* Properties */ int defaultGetPolynomialCoefficients(Context * context, const char * symbol, Expression expression[]) const; - bool reducedExpressionIsUnitsOnly() const { return node()->reducedExpressionIsUnitsOnly(); } // This must be called on a reduced expression /* Builder */ static bool IsZero(const Expression e); diff --git a/poincare/include/poincare/expression_node.h b/poincare/include/poincare/expression_node.h index 6cfc8f96b..1fc7aaa28 100644 --- a/poincare/include/poincare/expression_node.h +++ b/poincare/include/poincare/expression_node.h @@ -176,8 +176,6 @@ public: virtual int getVariables(Context * context, isVariableTest isVariable, char * variables, int maxSizeVariable, int nextVariableIndex) const; virtual float characteristicXRange(Context * context, Preferences::AngleUnit angleUnit) const; bool isOfType(Type * types, int length) const; - virtual bool beautifiedExpressionHasUnits() const { return false; } // This must be called on a beautified expression - virtual bool reducedExpressionIsUnitsOnly() const { return false; } // This must be called on a reduced expression /* Simplification */ /* SimplificationOrder returns: diff --git a/poincare/include/poincare/multiplication.h b/poincare/include/poincare/multiplication.h index 586a5e1c6..30eaf218d 100644 --- a/poincare/include/poincare/multiplication.h +++ b/poincare/include/poincare/multiplication.h @@ -25,8 +25,6 @@ public: int polynomialDegree(Context * context, const char * symbolName) const override; int getPolynomialCoefficients(Context * context, const char * symbolName, Expression coefficients[], ExpressionNode::SymbolicComputation symbolicComputation) const override; bool childAtIndexNeedsUserParentheses(const Expression & child, int childIndex) const override; - bool beautifiedExpressionHasUnits() const override; - bool reducedExpressionIsUnitsOnly() const override; // Approximation template static Complex compute(const std::complex c, const std::complex d, Preferences::ComplexFormat complexFormat) { return Complex::Builder(c*d); } diff --git a/poincare/include/poincare/power.h b/poincare/include/poincare/power.h index 03462471f..55861e502 100644 --- a/poincare/include/poincare/power.h +++ b/poincare/include/poincare/power.h @@ -32,8 +32,6 @@ public: int polynomialDegree(Context * context, const char * symbolName) const override; int getPolynomialCoefficients(Context * context, const char * symbolName, Expression coefficients[], ExpressionNode::SymbolicComputation symbolicComputation) const override; - bool beautifiedExpressionHasUnits() const override { return reducedExpressionIsUnitsOnly(); } - bool reducedExpressionIsUnitsOnly() const override; template static Complex compute(const std::complex c, const std::complex d, Preferences::ComplexFormat complexFormat); diff --git a/poincare/include/poincare/unit.h b/poincare/include/poincare/unit.h index 5b7b65e27..ca91bc214 100644 --- a/poincare/include/poincare/unit.h +++ b/poincare/include/poincare/unit.h @@ -112,8 +112,6 @@ public: // Expression Properties Type type() const override { return Type::Unit; } Sign sign(Context * context) const override; - bool beautifiedExpressionHasUnits() const override { return true; } - bool reducedExpressionIsUnitsOnly() const override { return true; } /* Layout */ Layout createLayout(Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const override; diff --git a/poincare/src/multiplication.cpp b/poincare/src/multiplication.cpp index a15acd8c4..5b314a32f 100644 --- a/poincare/src/multiplication.cpp +++ b/poincare/src/multiplication.cpp @@ -62,16 +62,6 @@ bool MultiplicationNode::childAtIndexNeedsUserParentheses(const Expression & chi return child.isOfType(types, 2); } -bool MultiplicationNode::beautifiedExpressionHasUnits() const { - assert(numberOfChildren() > 0); - return Expression(this).childAtIndex(numberOfChildren() - 1).beautifiedExpressionHasUnits(); -} - -bool MultiplicationNode::reducedExpressionIsUnitsOnly() const { - assert(numberOfChildren() > 0); - return Expression(this).childAtIndex(0).reducedExpressionIsUnitsOnly(); -} - template MatrixComplex MultiplicationNode::computeOnMatrices(const MatrixComplex m, const MatrixComplex n, Preferences::ComplexFormat complexFormat) { if (m.numberOfColumns() != n.numberOfRows()) { diff --git a/poincare/src/power.cpp b/poincare/src/power.cpp index fead4207b..a2a1d1551 100644 --- a/poincare/src/power.cpp +++ b/poincare/src/power.cpp @@ -86,10 +86,6 @@ int PowerNode::getPolynomialCoefficients(Context * context, const char * symbolN return Power(this).getPolynomialCoefficients(context, symbolName, coefficients); } -bool PowerNode::reducedExpressionIsUnitsOnly() const { - return childAtIndex(0)->type() == ExpressionNode::Type::Unit; -} - bool PowerNode::isReal(Context * context) const { Expression base(childAtIndex(0)); Expression index(childAtIndex(1));