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

[apps/calculation] ComplexListController: change the way the

Browse Source 
Complex model parameters are computed.

Sometimes, approximation without simplification doesn't not give the
same results as approximation after simplification. As we decided to
display the additional results from an approximation without
simplifcation (done in Expression::hasDefinedComplexApproximation), we
compute the model parameters the same way (to ensure that both
parameters are defined)
This commit is contained in:
Émilie Feral
2020-01-16 17:53:37 +01:00
committed by Léa Saviot
parent 58a4dcf62a
commit 2a37fa4447
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/calculation/additional_outputs/complex_list_controller.cpp
View File

@@ -1,6 +1,9 @@
#include "complex_list_controller.h"
#include "../app.h"
#include "../../shared/poincare_helpers.h"
#include <poincare/imaginary_part.h>
#include <poincare/real_part.h>
#include "complex_list_controller.h"
using namespace Poincare;
using namespace Shared;
@@ -29,8 +32,9 @@ void ComplexListController::setExpression(Poincare::Expression e) {
m_calculationStore.push("abs(z)", context);
// Set Complex illustration
float a = Shared::PoincareHelpers::ApproximateToScalar<float>(m_calculationStore.calculationAtIndex(2)->approximateOutput(context), context);
float b = Shared::PoincareHelpers::ApproximateToScalar<float>(m_calculationStore.calculationAtIndex(3)->approximateOutput(context), context);
// Compute a and b as in Expression::hasDefinedComplexApproximation to ensure the same defined result
float a = Shared::PoincareHelpers::ApproximateToScalar<float>(RealPart::Builder(e.clone()), context);
float b = Shared::PoincareHelpers::ApproximateToScalar<float>(ImaginaryPart::Builder(e.clone()), context);
m_model.setComplex(std::complex<float>(a,b));
// Reset complex format as before