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/expr] Remove beautifiedExpHasUnits and reducedExpIsUnitsOnly

Browse Source
This commit is contained in:
Léa Saviot
2020-02-05 11:27:05 +01:00
parent ecdcb100fb
commit 94334169f0
7 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
poincare/include/poincare/expression.h
View File

@@ -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);

2
poincare/include/poincare/expression_node.h
View File

@@ -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:

2
poincare/include/poincare/multiplication.h
View File

@@ -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<typename T> static Complex<T> compute(const std::complex<T> c, const std::complex<T> d, Preferences::ComplexFormat complexFormat) { return Complex<T>::Builder(c*d); }

2
poincare/include/poincare/power.h
View File

@@ -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<typename T> static Complex<T> compute(const std::complex<T> c, const std::complex<T> d, Preferences::ComplexFormat complexFormat);

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

@@ -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;

10
poincare/src/multiplication.cpp
View File

@@ -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<typename T>
MatrixComplex<T> MultiplicationNode::computeOnMatrices(const MatrixComplex<T> m, const MatrixComplex<T> n, Preferences::ComplexFormat complexFormat) {
if (m.numberOfColumns() != n.numberOfRows()) {

4
poincare/src/power.cpp
View File

@@ -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));