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

Poincare: Conditional use of the new simplification architecture

Browse Source 
Change-Id: I2d6c71eb919758e02547326795ee280c8551cf17
This commit is contained in:
Romain Goyet
2016-03-27 12:51:29 +02:00
parent eae34b3221
commit 60b648a1cc
1 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
poincare/src/expression.cpp
View File

@@ -1,14 +1,22 @@
#include <poincare/expression.h>
#include "expression_parser.hpp"
#include "expression_lexer.hpp"
#include "simplify/simplify.h"
#include "simplify/simplify_product_zero.h"
#include "simplify/simplify_addition_integer.h"
#include "simplify/simplify_commutative_merge.h"
extern "C" {
#include <assert.h>
}
#define USE_GENERIC_EXPRESSION_SIMPLIFIER 0
#if USE_GENERIC_EXPRESSION_SIMPLIFIER
#include "simplify/simplification_rules.h"
#else
#include "simplify/simplify.h"
#include "simplify/simplify_product_zero.h"
#include "simplify/simplify_integer_operation.h"
#include "simplify/simplify_commutative_merge.h"
static expression_simplifier_t kSimplifiers[] = {
&SimplifyProductZero,
@@ -17,6 +25,8 @@ static expression_simplifier_t kSimplifiers[] = {
nullptr
};
#endif
int poincare_expression_yyparse(yyscan_t scanner, Expression ** expressionOutput);
Expression::~Expression() {
@@ -34,6 +44,27 @@ Expression * Expression::parse(char const * string) {
return expression;
}
#if USE_GENERIC_EXPRESSION_SIMPLIFIER
Expression * Expression::simplify() {
Expression * result = this;
bool simplification_pass_was_useful = true;
while (simplification_pass_was_useful) {
simplification_pass_was_useful = false;
for (int i=0; i<numberOfSimplifications; i++) {
const Simplification * simplification = (simplifications + i); // Pointer arithmetics
Expression * simplified = simplification->simplify(result);
if (simplified != nullptr) {
simplification_pass_was_useful = true;
if (result != this) {
delete result;
}
result = simplified;
}
}
}
return result;
}
#else
Expression * Expression::simplify() {
Expression * result = this;
bool simplification_pass_was_useful = true;
@@ -54,6 +85,7 @@ Expression * Expression::simplify() {
}
return result;
}
#endif
bool Expression::isIdenticalTo(Expression * e) {
if (e->type() != this->type() || e->numberOfOperands() != this->numberOfOperands()) {