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

[poincare] Do not add parenthesis to often in childNeedsParenthesis

Browse Source
This commit is contained in:
Léa Saviot
2018-11-21 11:16:42 +01:00
committed by Émilie Feral
parent d59c836abd
commit 9c788d31d4
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
poincare/src/addition.cpp
View File

@@ -31,7 +31,11 @@ int AdditionNode::getPolynomialCoefficients(Context & context, const char * symb
// Layout
bool AdditionNode::childNeedsParenthesis(const TreeNode * child) const {
if ((static_cast<const ExpressionNode *>(child)->isNumber() && static_cast<const ExpressionNode *>(child)->sign() == Sign::Negative) || static_cast<const ExpressionNode *>(child)->type() == Type::Opposite) {
if (((static_cast<const ExpressionNode *>(child)->isNumber()
&& static_cast<const ExpressionNode *>(child)->sign() == Sign::Negative)
|| static_cast<const ExpressionNode *>(child)->type() == Type::Opposite)
&& child != childAtIndex(0))
{
return true;
}
return false;

4
poincare/src/factorial.cpp
View File

@@ -21,8 +21,8 @@ bool FactorialNode::childNeedsParenthesis(const TreeNode * child) const {
if (static_cast<const ExpressionNode *>(child)->type() == Type::Rational && !static_cast<const RationalNode *>(child)->denominator().isOne()) {
return true;
}
Type types[] = {Type::Subtraction, Type::Opposite, Type::Multiplication, Type::Division, Type::Addition, Type::Power, Type::Factorial};
return static_cast<const ExpressionNode *>(child)->isOfType(types, 7);
Type types[] = {Type::Subtraction, Type::Opposite, Type::Multiplication, Type::Division, Type::Addition, Type::Power};
return static_cast<const ExpressionNode *>(child)->isOfType(types, 6);
}
// Simplification

3
poincare/src/subtraction.cpp
View File

@@ -24,6 +24,9 @@ int SubtractionNode::polynomialDegree(Context & context, const char * symbolName
// Private
bool SubtractionNode::childNeedsParenthesis(const TreeNode * child) const {
if (child == childAtIndex(0)) {
return false;
}
if (static_cast<const ExpressionNode *>(child)->isNumber() && static_cast<const ExpressionNode *>(child)->sign() == Sign::Negative) {
return true;
}