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

Fix the recursiveness of simplification.

Browse Source 
Change-Id: I090f8bd14a85ff46d6cb9807e5a1204894a5c152
This commit is contained in:
Felix Raimundo
2016-04-11 16:40:05 +02:00
parent 3f8c05ad7e
commit 4e7f8d81bf
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
poincare/src/expression.cpp
View File

@@ -34,23 +34,28 @@ Expression * Expression::simplify() {
return this->clone();
}
/* We recursively simplify the children expressions.
* Note that we are sure to get the samne number of children as we had before
*/
Expression ** simplifiedOperands = (Expression**) malloc(this->numberOfOperands() * sizeof(Expression*));
for (int i = 0; i < this->numberOfOperands(); i++) {
simplifiedOperands[i] = this->operand(i)->simplify();
}
/* Note that we don't need to clone the simplified children because they are
* already cloned before. */
Expression * result = this->cloneWithDifferentOperands(simplifiedOperands, this->numberOfOperands(), false);
// The table is no longer needed.
free(simplifiedOperands);
Expression * result = this->clone();
Expression * tmp = nullptr;
bool simplification_pass_was_useful = true;
while (simplification_pass_was_useful) {
/* We recursively simplify the children expressions.
* Note that we are sure to get the samne number of children as we had before
*/
Expression ** simplifiedOperands = (Expression**) malloc(result->numberOfOperands() * sizeof(Expression*));
for (int i = 0; i < result->numberOfOperands(); i++) {
simplifiedOperands[i] = result->operand(i)->simplify();
}
/* Note that we don't need to clone the simplified children because they are
* already cloned before. */
tmp = result->cloneWithDifferentOperands(simplifiedOperands, result->numberOfOperands(), false);
delete result;
result = tmp;
// The table is no longer needed.
free(simplifiedOperands);
simplification_pass_was_useful = false;
for (int i=0; i<knumberOfSimplifications; i++) {
const Simplification * simplification = (simplifications + i); // Pointer arithmetics
@@ -59,6 +64,7 @@ Expression * Expression::simplify() {
simplification_pass_was_useful = true;
delete result;
result = simplified;
break;
}
}
}