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

[poincare] Store simplified expressions, not just reduced

Browse Source
This commit is contained in:
Léa Saviot
2018-11-07 11:53:50 +01:00
committed by Émilie Feral
parent 13972caa80
commit 5d96a87bf3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
poincare/src/store.cpp
View File

@@ -40,7 +40,8 @@ Evaluation<T> StoreNode::templatedApproximate(Context& context, Preferences::Ang
* Otherwise, it would have been replaced by its symbol. We thus have to
* setExpressionForSymbol. */
Store s(this);
context.setExpressionForSymbol(s.value(), s.symbol(), context);
Expression expressionToStore = s.value().clone().simplify(context, angleUnit, false);
context.setExpressionForSymbol(expressionToStore, s.symbol(), context);
Expression e = context.expressionForSymbol(s.symbol());
if (e.isUninitialized()) {
return Complex<T>::Undefined();
@@ -60,8 +61,7 @@ Expression Store::shallowReduce(Context & context, Preferences::AngleUnit angleU
assert(symbol().type() == ExpressionNode::Type::Symbol);
finalValue = childAtIndex(0);
}
finalValue = finalValue.deepReduce(context, angleUnit, false);
context.setExpressionForSymbol(finalValue, symbol(), context);
context.setExpressionForSymbol(finalValue.simplify(context, angleUnit, false), symbol(), context);
Expression e = context.expressionForSymbol(symbol());
replaceWithInPlace(e);
return e.shallowReduce(context, angleUnit, replaceSymbols);