UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-29 11:39:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

[poincare] simplifyForComplexFormat: simplify instead of reducing before extracting

Browse Source 
real and imaginary parts
This commit is contained in:
Émilie Feral
2018-11-30 11:47:30 +01:00
committed by Léa Saviot
parent 5dae60bc7e
commit a13246fca1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
poincare/src/expression.cpp
View File

@@ -360,19 +360,21 @@ bool isMinusOne(const Expression e) {
Expression Expression::simplifyForComplexFormat(Context & context, Preferences::AngleUnit angleUnit, Preferences::ComplexFormat complexFormat) {
sSimplificationHasBeenInterrupted = false;
Expression e = deepReduce(context, angleUnit, ExpressionNode::ReductionTarget::User);
// We simplify before extracting the real and imaginary part to develop expression of type (a+b*i)^3 for example
// We could have deepReduce the expression but we want to keep division which are easier to extract complex parts from
Expression e = simplify(context, angleUnit);
if (sSimplificationHasBeenInterrupted) {
return Expression();
}
Expression ra = complexFormat == Preferences::ComplexFormat::Cartesian ? e.realPart(context, angleUnit) : e.complexNorm(context, angleUnit);
Expression tb = complexFormat == Preferences::ComplexFormat::Cartesian ? e.imaginaryPart(context, angleUnit) : e.complexArgument(context, angleUnit);
if (ra.isUninitialized() || tb.isUninitialized()) {
return e.deepBeautify(context, angleUnit);
return e;
}
ra = ra.simplify(context, angleUnit);
tb = tb.simplify(context, angleUnit);
if (ra.isUninitialized() || tb.isUninitialized()) {
return e.deepBeautify(context, angleUnit);
return e;
}
e = CreateComplexExpression(ra, tb, complexFormat,
ra.type() == ExpressionNode::Type::Undefined || tb.type() == ExpressionNode::Type::Undefined,