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

[poincare] In trigonometry, avoid to loop on trigo table if the

Browse Source 
expression does have the right type

Change-Id: I2cd5169df6709943aeddf96d098aa8d8275465d0
This commit is contained in:
Émilie Feral
2017-11-23 14:54:29 +01:00
parent 42e407cad5
commit 54fbcfe15c
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
poincare/src/trigonometry.cpp
View File

@@ -180,6 +180,17 @@ Expression * Trigonometry::table(const Expression * e, Expression::Type type, Co
int trigonometricFunctionIndex = type == Expression::Type::Cosine || type == Expression::Type::ArcCosine ? 2 : (type == Expression::Type::Sine || type == Expression::Type::ArcSine ? 3 : 4);
int inputIndex = type == Expression::Type::ArcCosine || type == Expression::Type::ArcSine || type == Expression::Type::ArcTangent ? trigonometricFunctionIndex : angleUnitIndex;
int outputIndex = type == Expression::Type::ArcCosine || type == Expression::Type::ArcSine || type == Expression::Type::ArcTangent ? angleUnitIndex : trigonometricFunctionIndex;
/* Avoid looping if we can exclude quickly that the e is in the table */
if (inputIndex == 0 && e->type() != Expression::Type::Rational) {
return nullptr;
}
if (inputIndex == 1 && e->type() != Expression::Type::Rational && e->type() != Expression::Type::Multiplication && e->type() != Expression::Type::Symbol) {
return nullptr;
}
if (inputIndex >1 && e->type() != Expression::Type::Rational && e->type() != Expression::Type::Multiplication && e->type() != Expression::Type::Power && e->type() != Expression::Type::Addition) {
return nullptr;
}
for (int i = 0; i < k_numberOfEntries; i++) {
Expression * input = Expression::parse(cheatTable[i][inputIndex]);
if (input == nullptr) {