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

[calculation] Use ParseAndSimplifyForComplexFormat instead of

Browse Source 
ParseAndSimplify
This commit is contained in:
Émilie Feral
2018-11-28 16:20:31 +01:00
committed by Léa Saviot
parent 56c8e8b704
commit 79e7fb2183
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/calculation/calculation.cpp
View File

@@ -41,7 +41,7 @@ void Calculation::setContent(const char * c, Context * context, Expression ansEx
* to keep Ans symbol in the calculation store. */
PoincareHelpers::Serialize(input, m_inputText, sizeof(m_inputText));
}
Expression exactOutput = PoincareHelpers::ParseAndSimplify(m_inputText, *context);
Expression exactOutput = PoincareHelpers::ParseAndSimplifyForComplexFormat(m_inputText, *context);
PoincareHelpers::Serialize(exactOutput, m_exactOutputText, sizeof(m_exactOutputText));
Expression approximateOutput = PoincareHelpers::Approximate<double>(exactOutput, *context);
PoincareHelpers::Serialize(approximateOutput, m_approximateOutputText, sizeof(m_approximateOutputText));

4
apps/shared/poincare_helpers.h
View File

@@ -41,6 +41,10 @@ inline Poincare::Expression ParseAndSimplify(const char * text, Poincare::Contex
return Poincare::Expression::ParseAndSimplify(text, context, Poincare::Preferences::sharedPreferences()->angleUnit());
}
inline Poincare::Expression ParseAndSimplifyForComplexFormat(const char * text, Poincare::Context & context) {
return Poincare::Expression::ParseAndSimplifyForComplexFormat(text, context, Poincare::Preferences::sharedPreferences()->angleUnit(), Poincare::Preferences::sharedPreferences()->complexFormat());
}
inline void Simplify(Poincare::Expression * e, Poincare::Context & context) {
*e = e->simplify(context, Poincare::Preferences::sharedPreferences()->angleUnit());
}