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

[poincare] Expression: clean magic numbers

Browse Source
This commit is contained in:
Émilie Feral
2020-06-12 13:49:32 +02:00
parent ff3b756080
commit d21c9b0880
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
poincare/src/expression.cpp
View File

@@ -126,7 +126,7 @@ bool Expression::deepIsMatrix(Context * context) const {
}
// Scalar expressions
ExpressionNode::Type types1[] = {ExpressionNode::Type::BinomialCoefficient, ExpressionNode::Type::Derivative, ExpressionNode::Type::Determinant, ExpressionNode::Type::DivisionQuotient, ExpressionNode::Type::DivisionRemainder, ExpressionNode::Type::Factor, ExpressionNode::Type::GreatCommonDivisor, ExpressionNode::Type::Integral, ExpressionNode::Type::LeastCommonMultiple, ExpressionNode::Type::MatrixTrace, ExpressionNode::Type::NthRoot, ExpressionNode::Type::PermuteCoefficient, ExpressionNode::Type::Randint, ExpressionNode::Type::Round, ExpressionNode::Type::SignFunction, ExpressionNode::Type::SquareRoot};
if (isOfType(types1, 16)) {
if (isOfType(types1, sizeof(types1)/sizeof(ExpressionNode::Type))) {
return false;
}
// The children were sorted so any expression which is a matrix (deeply) would be at the end
@@ -137,7 +137,7 @@ bool Expression::deepIsMatrix(Context * context) const {
}
// Logarithm, Power, Product, Sum are matrices only if their first child is a matrix
ExpressionNode::Type types2[] = {ExpressionNode::Type::Logarithm, ExpressionNode::Type::Power, ExpressionNode::Type::Product, ExpressionNode::Type::Sum};
if (isOfType(types2, 4)) {
if (isOfType(types2, sizeof(types2)/sizeof(ExpressionNode::Type))) {
assert(numberOfChildren() > 0);
return childAtIndex(0).deepIsMatrix(context);
}