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

[apps/solver] Fix bad assertion

Browse Source
This commit is contained in:
Léa Saviot
2019-09-04 17:33:04 +02:00
parent 4ccd9eed53
commit 1b169e0836
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/probability/distribution/distribution.cpp
View File

@@ -128,7 +128,9 @@ double Distribution::cumulativeDistributiveInverseForProbabilityUsingIncreasingF
this,
probability,
nullptr);
assert(std::isnan(result.x2()) || std::fabs(result.x2()) < valuePrecision);
/* Either no result was found, the precision is ok or the result was outside
* the given ax bx bounds */
assert(std::isnan(result.x2()) || std::fabs(result.x2()) < valuePrecision || result.x1() == ax);
return result.x1();
}

2
poincare/include/poincare/solver.h
View File

@@ -15,7 +15,7 @@ public:
// Root
static double BrentRoot(double ax, double bx, double precision, ValueAtAbscissa evaluation, Context * context, Preferences::ComplexFormat complexFormat, Preferences::AngleUnit angleUnit, const void * context1 = nullptr, const void * context2 = nullptr, const void * context3 = nullptr);
static Coordinate2D<double> IncreasingFunctionRoot(double ax, double bx, double resultPrecision, double valuePrecision, ValueAtAbscissa evaluation, Context * context, Preferences::ComplexFormat complexFormat, Preferences::AngleUnit angleUnit, const void * context1 = nullptr, const void * context2 = nullptr, const void * context3 = nullptr);
static Coordinate2D<double> IncreasingFunctionRoot(double ax, double bx, double resultPrecision, double valuePrecision, ValueAtAbscissa evaluation, Context * context, Preferences::ComplexFormat complexFormat, Preferences::AngleUnit angleUnit, const void * context1 = nullptr, const void * context2 = nullptr, const void * context3 = nullptr, double * resultEvaluation = nullptr);
// Proba

15
poincare/src/solver.cpp
View File

@@ -174,19 +174,18 @@ double Solver::BrentRoot(double ax, double bx, double precision, ValueAtAbscissa
return NAN;
}
Coordinate2D<double> Solver::IncreasingFunctionRoot(double ax, double bx, double resultPrecision, double valuePrecision, ValueAtAbscissa evaluation, Context * context, Preferences::ComplexFormat complexFormat, Preferences::AngleUnit angleUnit, const void * context1, const void * context2, const void * context3) {
Coordinate2D<double> Solver::IncreasingFunctionRoot(double ax, double bx, double resultPrecision, double valuePrecision, ValueAtAbscissa evaluation, Context * context, Preferences::ComplexFormat complexFormat, Preferences::AngleUnit angleUnit, const void * context1, const void * context2, const void * context3, double * resultEvaluation) {
assert(ax < bx);
double min = ax;
double max = bx;
double currentAbscissa = min;
double eval = evaluation(currentAbscissa, context, complexFormat, angleUnit, context1, context2, context3);
if (eval >= 0) {
if (eval <= DBL_EPSILON) {
// The value on the left bracket is 0, return it.
return Coordinate2D<double>(currentAbscissa, eval);
if (resultEvaluation != nullptr) {
*resultEvaluation = eval;
}
// The minimal value is already bigger than 0, return NAN.
return Coordinate2D<double>(NAN, NAN);
return Coordinate2D<double>(currentAbscissa, eval);
}
while (max - min > resultPrecision) {
currentAbscissa = (min + max) / 2.0;
@@ -199,10 +198,10 @@ Coordinate2D<double> Solver::IncreasingFunctionRoot(double ax, double bx, double
break;
}
}
if (std::fabs(eval) < valuePrecision) {
return Coordinate2D<double>(currentAbscissa, eval);
if (resultEvaluation != nullptr) {
*resultEvaluation = eval;
}
return Coordinate2D<double>(NAN, NAN);
return Coordinate2D<double>(currentAbscissa, eval);
}
template<typename T>