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] Interrupt simplification if current expression is matrix

Browse Source 
Do not recursively check for matrices
This commit is contained in:
Léa Saviot
2018-11-08 11:46:00 +01:00
committed by Émilie Feral
parent f65b133b37
commit 07c2d6a95e
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
poincare/src/expression.cpp
View File

@@ -176,7 +176,6 @@ void Expression::defaultReduceChildren(Context & context, Preferences::AngleUnit
void Expression::defaultDeepReduceChildren(Context & context, Preferences::AngleUnit angleUnit, bool replaceSymbols) {
for (int i = 0; i < numberOfChildren(); i++) {
assert(!childAtIndex(i).recursivelyMatches(IsMatrix, context));
childAtIndex(i).deepReduce(context, angleUnit, replaceSymbols);
}
}
@@ -280,32 +279,29 @@ Expression Expression::ParseAndSimplify(const char * text, Context & context, Pr
Expression Expression::simplify(Context & context, Preferences::AngleUnit angleUnit, bool replaceSymbols) {
sSimplificationHasBeenInterrupted = false;
#if MATRIX_EXACT_REDUCING
#else
if (recursivelyMatches(IsMatrix, context)) {
return *this;
}
#endif
Expression e = deepReduce(context, angleUnit, replaceSymbols);
if (sSimplificationHasBeenInterrupted) {
return Expression();
}
e = e.deepBeautify(context, angleUnit);
if (sSimplificationHasBeenInterrupted) {
e = Expression();
return Expression();
}
return e;
}
Expression Expression::reduce(Context & context, Preferences::AngleUnit angleUnit, bool replaceSymbols) {
#if MATRIX_EXACT_REDUCING
#else
if (recursivelyMatches(IsMatrix, context)) {
return *this;
}
#endif
return deepReduce(context, angleUnit, replaceSymbols);
}
Expression Expression::deepReduce(Context & context, Preferences::AngleUnit angleUnit, bool replaceSymbols) {
assert(!recursivelyMatches(IsMatrix, context));
#if MATRIX_EXACT_REDUCING
#else
if (IsMatrix(*this, context)) {
sSimplificationHasBeenInterrupted = true;
return *this;
}
#endif
deepReduceChildren(context, angleUnit, replaceSymbols);
return shallowReduce(context, angleUnit, replaceSymbols);
}