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] Fix bug in equal simplifcation

Browse Source
This commit is contained in:
Laury
2022-01-15 10:55:52 +01:00
parent f862cb023a
commit cbbe7ef6ac
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
poincare/src/equal.cpp
View File

@@ -52,19 +52,15 @@ Expression Equal::standardEquation(Context * context, Preferences::ComplexFormat
Expression Equal::shallowReduce(ExpressionNode::ReductionContext reductionContext) { Expression Equal::shallowReduce(ExpressionNode::ReductionContext reductionContext) {
Expression e = Equal::Builder(Subtraction::Builder(childAtIndex(0).clone(), childAtIndex(1).clone()).shallowReduce(reductionContext), Rational::Builder(0)); Expression e = Equal::Builder(Subtraction::Builder(childAtIndex(0).clone(), childAtIndex(1).clone()).shallowReduce(reductionContext), Rational::Builder(0));
Expression leftSide = e.childAtIndex(0); Expression leftSide = e.childAtIndex(0);
if (leftSide.isIdenticalTo(e.childAtIndex(1))) {
Expression result = Rational::Builder(1);
replaceWithInPlace(result);
return result;
}
if (leftSide.isUndefined()) { if (leftSide.isUndefined()) {
return leftSide; return leftSide; // <=> undefined
} }
if (leftSide.type() == ExpressionNode::Type::Multiplication) { if (leftSide.type() == ExpressionNode::Type::Multiplication) { // Simplify multiplication
Multiplication m = static_cast<Multiplication&>(leftSide); Multiplication m = static_cast<Multiplication&>(leftSide);
int i = 0; int i = 0;
while (i < numberOfChildren()-1) { while (i < m.numberOfChildren()) {
if (m.childAtIndex(i).nullStatus(reductionContext.context()) == ExpressionNode::NullStatus::NonNull) { if (m.childAtIndex(i).nullStatus(reductionContext.context()) == ExpressionNode::NullStatus::NonNull) {
m.removeChildAtIndexInPlace(i); m.removeChildAtIndexInPlace(i);
} }
@@ -72,6 +68,23 @@ Expression Equal::shallowReduce(ExpressionNode::ReductionContext reductionContex
i++; i++;
} }
} }
// Replace if 0 child
if (m.numberOfChildren() == 0) {
e.replaceChildAtIndexInPlace(0, Rational::Builder(0));
} else {
// Squash if one child
Expression result = m.squashUnaryHierarchyInPlace();
if (result != *this) {
e.replaceChildAtIndexInPlace(0, result);
}
}
}
if (leftSide.isIdenticalTo(e.childAtIndex(1))) {
Expression result = Rational::Builder(1);
replaceWithInPlace(result);
return result;
} }
return e; return e;