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] Improve Power::simplify

Browse Source 
Change-Id: I7514ccde02ab92db84778ba385703169b7636ce1
This commit is contained in:
Émilie Feral
2017-10-09 14:08:22 +02:00
parent 5ddcbbe4b7
commit a0248deaee
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
poincare/src/power.cpp
View File

@@ -179,26 +179,28 @@ void Power::immediateSimplify() {
return;
}
// (a*b*...)^r -> |a|^r*(sign(a)*b*)^r if a rational
// TODO: this rule should apply on a positive (and not only a rational)
if (m->operand(0)->type() == Type::Rational) {
Expression * r = const_cast<Expression *>(operand(1));
Expression * rCopy = r->clone();
Rational * factor = static_cast<Rational *>((Expression *)m->operand(0));
if (factor->isNegative()) {
m->replaceOperand(factor, new Rational(Integer(-1)), false);
} else {
m->removeOperand(factor, false);
for (int i = 0; i < m->numberOfOperands(); i++) {
if (m->operand(i)->isPositive() || m->operand(i)->type() == Type::Rational) {
Expression * r = const_cast<Expression *>(operand(1));
Expression * rCopy = r->clone();
Expression * factor = const_cast<Expression *>(m->operand(0));
if (!factor->isPositive()) {
m->replaceOperand(factor, new Rational(Integer(-1)), false);
static_cast<Rational *>(factor)->setNegative(false);
} else {
m->removeOperand(factor, false);
}
m->immediateSimplify();
const Expression * powOperands[2] = {factor, rCopy};
Power * p = new Power(powOperands, false);
const Expression * multOperands[2] = {p, clone()};
Multiplication * root = new Multiplication(multOperands, 2, false);
p->immediateSimplify();
const_cast<Expression *>(root->operand(1))->immediateSimplify();
replaceWith(root, true);
root->immediateSimplify();
return;
}
m->immediateSimplify();
factor->setNegative(false);
const Expression * powOperands[2] = {factor, rCopy};
Power * p = new Power(powOperands, false);
const Expression * multOperands[2] = {p, clone()};
Multiplication * root = new Multiplication(multOperands, 2, false);
p->immediateSimplify();
replaceWith(root, true);
root->immediateSimplify();
return;
}
}
// a^(b+c) -> Rational(a^b)*a^c with a and b rational