diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 1da919553..4c4dfcc53 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -51,6 +51,9 @@ If the output is not quite correct, check for invisible trailing spaces! + + Avoid infinite recursion in "Beta.regularizedBeta" (package "o.a.c.m.special"); + Refactoring of curve fitters (package "o.a.c.m.fitting"). diff --git a/src/main/java/org/apache/commons/math3/special/Beta.java b/src/main/java/org/apache/commons/math3/special/Beta.java index c6091b48c..04696f971 100644 --- a/src/main/java/org/apache/commons/math3/special/Beta.java +++ b/src/main/java/org/apache/commons/math3/special/Beta.java @@ -189,11 +189,12 @@ public class Beta { Double.isNaN(b) || x < 0 || x > 1 || - a <= 0.0 || - b <= 0.0) { + a <= 0 || + b <= 0) { ret = Double.NaN; - } else if (x > (a + 1.0) / (a + b + 2.0)) { - ret = 1.0 - regularizedBeta(1.0 - x, b, a, epsilon, maxIterations); + } else if (x > (a + 1) / (2 + b + a) && + 1 - x <= (b + 1) / (2 + b + a)) { + ret = 1 - regularizedBeta(1 - x, b, a, epsilon, maxIterations); } else { ContinuedFraction fraction = new ContinuedFraction() { diff --git a/src/test/java/org/apache/commons/math3/special/BetaTest.java b/src/test/java/org/apache/commons/math3/special/BetaTest.java index fc9ac9c27..f886cea50 100644 --- a/src/test/java/org/apache/commons/math3/special/BetaTest.java +++ b/src/test/java/org/apache/commons/math3/special/BetaTest.java @@ -141,6 +141,19 @@ public class BetaTest { TestUtils.assertEquals(9.999950000166648e-6, actual, 1e-16); } + @Test + public void testMath1067() { + final double x = 0.22580645161290325; + final double a = 64.33333333333334; + final double b = 223; + + try { + final double r = Beta.regularizedBeta(x, a, b, 1e-14, 10000); + } catch (StackOverflowError error) { + Assert.fail("Infinite recursion"); + } + } + @Test public void testLogBetaNanPositive() { testLogBeta(Double.NaN, Double.NaN, 2.0);