UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-26 01:00:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare] Expression::reduce is a private method. Expression is friend

Browse Source 
with the right classes
This commit is contained in:
Émilie Feral
2018-08-09 14:27:07 +02:00
parent c69a7faa5d
commit 067fbfcfc7
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
poincare/include/poincare/addition.h
View File

@@ -45,9 +45,7 @@ public:
private:
// Layout
bool needsParenthesesWithParent(const SerializationHelperInterface * parentNode) const override;
LayoutRef createLayout(Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const override {
return LayoutHelper::Infix(Expression(this), floatDisplayMode, numberOfSignificantDigits, name());
}
LayoutRef createLayout(Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const override;
int serialize(char * buffer, int bufferSize, Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const override {
return SerializationHelper::Infix(this, buffer, bufferSize, floatDisplayMode, numberOfSignificantDigits, name());
}

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

@@ -13,11 +13,13 @@ namespace Poincare {
class Context;
class Expression : public TreeByValue {
friend class AdditionNode;
friend class ExpressionNode;
friend class MultiplicationNode;
friend class NAryExpressionNode;
friend class SubtractionNode;
friend class Multiplication;
friend class Subtraction;
friend class Addition;
friend class Opposite;
friend class Symbol;
friend class Decimal;
public:
/* Constructor & Destructor */
Expression() : Expression(nullptr) {}
@@ -106,7 +108,6 @@ public:
/* Simplification */
static Expression ParseAndSimplify(const char * text, Context & context, Preferences::AngleUnit angleUnit);
Expression simplify(Context & context, Preferences::AngleUnit angleUnit);
Expression deepReduce(Context & context, Preferences::AngleUnit angleUnit) const;
/* Approximation Helper */
template<typename U> Expression approximate(Context& context, Preferences::AngleUnit angleUnit, Preferences::Preferences::ComplexFormat complexFormat) const;
@@ -126,14 +127,14 @@ public:
protected:
Expression(const ExpressionNode * n) : TreeByValue(n) {}
/* Simplification */
Expression shallowReduce(Context & context, Preferences::AngleUnit angleUnit) const;
private:
/* Properties */
int getPolynomialCoefficients(char symbolName, Expression coefficients[], Context & context, Preferences::AngleUnit angleUnit) const;
/* Simplification */
Expression shallowReduce(Context & context, Preferences::AngleUnit angleUnit) const;
Expression deepReduce(Context & context, Preferences::AngleUnit angleUnit) const;
Expression shallowBeautify(Context & context, Preferences::AngleUnit angleUnit) const;
Expression deepBeautify(Context & context, Preferences::AngleUnit angleUnit) const;

4
poincare/src/addition.cpp
View File

@@ -53,6 +53,10 @@ bool AdditionNode::needsParenthesesWithParent(const SerializationHelperInterface
return static_cast<const ExpressionNode *>(parentNode)->isOfType(types, 6);
}
LayoutRef AdditionNode::createLayout(Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const {
return LayoutHelper::Infix(Addition(this), floatDisplayMode, numberOfSignificantDigits, name());
}
// Simplication
Expression AdditionNode::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) const {

2
poincare/src/multiplication.cpp
View File

@@ -129,7 +129,7 @@ bool MultiplicationNode::needsParenthesesWithParent(const SerializationHelperInt
LayoutRef MultiplicationNode::createLayout(Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const {
const char middleDotString[] = {Ion::Charset::MiddleDot, 0};
return LayoutHelper::Infix(Expression(this), floatDisplayMode, numberOfSignificantDigits, middleDotString);
return LayoutHelper::Infix(Multiplication(this), floatDisplayMode, numberOfSignificantDigits, middleDotString);
}
int MultiplicationNode::serialize(char * buffer, int bufferSize, Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const {

2
poincare/src/subtraction.cpp
View File

@@ -35,7 +35,7 @@ bool SubtractionNode::needsParenthesesWithParent(const SerializationHelperInterf
}
LayoutRef SubtractionNode::createLayout(Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const {
return LayoutHelper::Infix(Expression(this), floatDisplayMode, numberOfSignificantDigits, name());
return LayoutHelper::Infix(Subtraction(this), floatDisplayMode, numberOfSignificantDigits, name());
}
int SubtractionNode::serialize(char * buffer, int bufferSize, Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const {