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

[poincare] Fix Multiplication::simplify

Browse Source 
Change-Id: I8c2b7a1f40a54c121c3068abb15e4a711d1aa115
This commit is contained in:
Émilie Feral
2017-10-05 17:57:30 +02:00
parent d995226baa
commit d35caae854
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
poincare/src/multiplication.cpp
View File

@@ -69,15 +69,20 @@ bool Multiplication::HaveSameNonRationalFactors(const Expression * e1, const Exp
}
void Multiplication::privateSimplify() {
for (int i=0; i<numberOfOperands(); i++) {
Expression * o = (Expression *)operand(i);
/* First loop: merge all multiplication, break if 0 or undef */
int index = 0;
while (index < numberOfOperands()) {
Expression * o = (Expression *)operand(index++);
if (o->type() == Type::Multiplication) {
mergeOperands(static_cast<Multiplication *>(o));
index = 0;
} else if (o->type() == Type::Rational && static_cast<const Rational *>(o)->isZero()) {
replaceWith(new Rational(Integer(0)), true);
return;
}
/* if (o->type() == Type::Undefined) {
* replaceWith(new Undefined(), true);
* return;
* }*/
}
sortChildren();
@@ -100,8 +105,6 @@ void Multiplication::factorizeChildren(Expression * e1, Expression * e2) {
const Expression * addOperands[2] = {CreateExponent(e1), CreateExponent(e2)};
removeOperand(e2, true);
Expression * s = new Addition(addOperands, 2, false);
s->setParent(this);
s->simplify();
removeOperand(e2, true);
if (e1->type() == Type::Power) {
e1->replaceOperand(e1->operand(1), s, true);
@@ -109,6 +112,7 @@ void Multiplication::factorizeChildren(Expression * e1, Expression * e2) {
const Expression * operands[2] = {e1, s};
e1->replaceWith(new Power(operands, false), false);
}
s->privateSimplify();
}
const Expression * Multiplication::CreateExponent(Expression * e) {