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

[poincare] Fix Expression::simplifyAndApproximate to display polar form

Browse Source 
of negative real expression. -5 --> 5*e^(i*Pi)
This commit is contained in:
Émilie Feral
2018-12-17 16:17:00 +01:00
committed by Léa Saviot
parent c6039423a9
commit e4b59ddf69
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
poincare/src/expression.cpp
View File

@@ -402,10 +402,10 @@ void Expression::simplifyAndApproximate(Expression * simplifiedExpression, Expre
Expression e = deepReduce(context, angleUnit, ExpressionNode::ReductionTarget::User);
*simplifiedExpression = Expression();
if (!sSimplificationHasBeenInterrupted) {
/* Case 1: the reduced expression is ComplexCartesian, we can take
* into account the complex format to display a+i*b or r*e^(i*th) */
if (e.type() == ExpressionNode::Type::ComplexCartesian) {
ComplexCartesian ecomplex = static_cast<ComplexCartesian &>(e);
/* Case 1: the reduced expression is ComplexCartesian or pure real, we can
* take into account the complex format to display a+i*b or r*e^(i*th) */
if (e.type() == ExpressionNode::Type::ComplexCartesian || e.isReal(context, angleUnit)) {
ComplexCartesian ecomplex = e.type() == ExpressionNode::Type::ComplexCartesian ? static_cast<ComplexCartesian &>(e) : ComplexCartesian::Builder(e, Rational(0));
if (approximateExpression) {
/* Step 2: Approximation
* We compute the approximate expression from the Cartesian form to avoid