scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-20 22:39:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Address improvements mentioned by @hkrish in #794

Browse source
This commit is contained in:
Jürg Lehni 2015-10-04 18:36:18 +02:00
parent 5601e21996
commit d2c762997f
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/util/Numerical.js
View file

@ -201,7 +201,9 @@ var Numerical = new function() {
x1, x2 = Infinity,
B = b,
D;
b /= 2;
// a, b, c are expected to be the coefficients of the equation:
// Ax² - 2Bx + C == 0, so we take b = -B/2:
b /= -2;
D = b * b - a * c; // Discriminant
// If the discriminant is very small, we can try to pre-condition
// the coefficients, so that we may get better accuracy
@ -228,19 +230,16 @@ var Numerical = new function() {
if (abs(B) < EPSILON)
return abs(c) < EPSILON ? -1 : 0;
x1 = -c / B;
} else {
// No real roots if D < 0
if (D >= -MACHINE_EPSILON) {
var R = D < 0 ? 0 : sqrt(D);
// Try to minimize floating point noise.
if (abs(b) < MACHINE_EPSILON) {
x1 = abs(a) >= abs(c) ? R / a : -c / R;
x2 = -x1;
} else {
var q = (b < 0 ? R : -R) - b;
x1 = q / a;
x2 = c / q;
}
} else if (D >= -MACHINE_EPSILON) { // No real roots if D < 0
var Q = D < 0 ? 0 : sqrt(D),
R = b + (b < 0 ? -Q : Q);
// Try to minimize floating point noise.
if (R === 0) {
x1 = c / a;
x2 = -x1;
} else {
x1 = R / a;
x2 = c / R;
}
}
// We need to include EPSILON in the comparisons with min / max,