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

[poincare] Avoid infinite loop in intersection/extrema solver

Browse Source
This commit is contained in:
Émilie Feral
2018-06-05 09:53:24 +02:00
parent f78615db40
commit e50cc3a0bd
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
poincare/src/expression.cpp
View File

@@ -491,8 +491,11 @@ Expression::Coordinate2D Expression::nextIntersection(char symbol, double start,
}
Expression::Coordinate2D Expression::nextMinimumOfExpression(char symbol, double start, double step, double max, EvaluationAtAbscissa evaluate, Context & context, const Expression * expression, bool lookForRootMinimum) const {
double bracket[3];
Coordinate2D result = {.abscissa = NAN, .value = NAN};
if (start == max || step == 0.0) {
return result;
}
double bracket[3];
double x = start;
bool endCondition = false;
do {
@@ -638,6 +641,9 @@ Expression::Coordinate2D Expression::brentMinimum(char symbol, double ax, double
}
double Expression::nextIntersectionWithExpression(char symbol, double start, double step, double max, EvaluationAtAbscissa evaluation, Context & context, const Expression * expression) const {
if (start == max || step == 0.0) {
return NAN;
}
double bracket[2];
double result = NAN;
static double precisionByGradUnit = 1E6;