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

[poincare] Update Division

Browse Source
This commit is contained in:
Léa Saviot
2018-08-31 11:16:12 +02:00
parent c97f3cc929
commit 009a372c32
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
poincare/include/poincare/division.h
View File

@@ -52,7 +52,7 @@ public:
}
// Simplification
virtual Expression shallowReduce(Context& context, Preferences::AngleUnit angleUnit, const Expression futureParent) override;
Expression shallowReduce(Context& context, Preferences::AngleUnit angleUnit, const Expression futureParent) override;
private:
template<typename T> static Complex<T> compute(const std::complex<T> c, const std::complex<T> d);

7
poincare/src/division.cpp
View File

@@ -65,10 +65,11 @@ Expression Division::shallowReduce(Context& context, Preferences::AngleUnit angl
if (result.isUndefinedOrAllocationFailure()) {
return result;
}
Multiplication m = Multiplication(childAtIndex(0));
Expression p = Power(childAtIndex(1), Rational(-1));
p = p.shallowReduce(context, angleUnit); // Imagine Division(2,1). p would be 1^(-1) which can be simplified
Multiplication m = Multiplication(childAtIndex(0), p);
return m.shallowReduce(context, angleUnit);
p = p.shallowReduce(context, angleUnit, m); // Imagine Division(2,1). p would be 1^(-1) which can be simplified
m.addChildAtIndexInPlace(p, m.numberOfChildren(), m.numberOfChildren());
return m.shallowReduce(context, angleUnit, futureParent);
}
}