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] Avoid creating decimal before approximating it in

Browse Source 
approximateToScalar
This commit is contained in:
Émilie Feral
2018-04-23 12:08:29 +02:00
parent 376d9ef9a2
commit 73bb09b904
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
poincare/src/expression.cpp
View File

@@ -471,11 +471,14 @@ template<typename T> Expression * Expression::approximate(Context& context, Angl
}
template<typename T> T Expression::approximateToScalar(Context& context, AngleUnit angleUnit, ComplexFormat complexFormat) const {
Expression * evaluation = approximate<T>(context, angleUnit, complexFormat);
T result = NAN;
if (evaluation->type() == Type::Decimal) {
result = static_cast<const Decimal *>(evaluation)->toScalar<T>();
if (angleUnit == AngleUnit::Default) {
angleUnit = Preferences::sharedPreferences()->angleUnit();
}
if (complexFormat == ComplexFormat::Default) {
complexFormat = Preferences::sharedPreferences()->complexFormat();
}
Evaluation<T> * evaluation = privateApproximate(T(), context, angleUnit);
T result = evaluation->toScalar();
/*if (evaluation->type() == Type::Matrix) {
if (numberOfOperands() == 1) {
result = static_cast<const Complex<T> *>(operand(0))->toScalar();