This is an automated email from the ASF dual-hosted git repository. aherbert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-statistics.git
commit e1284c907b8315876ad3828f0f06c53eb5809856 Author: aherbert <aherb...@apache.org> AuthorDate: Fri Jul 30 16:50:50 2021 +0100 Use 'dist' for the distribution name in tests --- .../distribution/BetaDistributionTest.java | 50 +++++++++++----------- .../distribution/CauchyDistributionTest.java | 6 +-- .../distribution/ChiSquaredDistributionTest.java | 8 ++-- .../distribution/ExponentialDistributionTest.java | 4 +- .../distribution/GammaDistributionTest.java | 20 ++++----- .../distribution/GumbelDistributionTest.java | 14 +++--- .../distribution/LaplaceDistributionTest.java | 14 +++--- .../distribution/LevyDistributionTest.java | 14 +++--- .../distribution/LogNormalDistributionTest.java | 16 +++---- .../distribution/LogisticDistributionTest.java | 20 ++++----- .../distribution/NakagamiDistributionTest.java | 14 +++--- .../distribution/NormalDistributionTest.java | 4 +- .../distribution/ParetoDistributionTest.java | 16 +++---- .../distribution/PascalDistributionTest.java | 6 +-- .../distribution/TriangularDistributionTest.java | 8 ++-- .../UniformContinuousDistributionTest.java | 8 ++-- .../distribution/WeibullDistributionTest.java | 6 +-- .../distribution/ZipfDistributionTest.java | 6 +-- 18 files changed, 117 insertions(+), 117 deletions(-) diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BetaDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BetaDistributionTest.java index 336b61c..dbbf4e6 100644 --- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BetaDistributionTest.java +++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BetaDistributionTest.java @@ -219,36 +219,36 @@ class BetaDistributionTest { } private static void checkCumulative(double alpha, double beta, double[] x, double[] cumes) { - final BetaDistribution d = new BetaDistribution(alpha, beta); + final BetaDistribution dist = new BetaDistribution(alpha, beta); for (int i = 0; i < x.length; i++) { - Assertions.assertEquals(cumes[i], d.cumulativeProbability(x[i]), 1e-8); + Assertions.assertEquals(cumes[i], dist.cumulativeProbability(x[i]), 1e-8); } for (int i = 1; i < x.length - 1; i++) { - Assertions.assertEquals(x[i], d.inverseCumulativeProbability(cumes[i]), 1e-5); + Assertions.assertEquals(x[i], dist.inverseCumulativeProbability(cumes[i]), 1e-5); } } private static void checkSurvival(double alpha, double beta, double[] cumes) { - final BetaDistribution d = new BetaDistribution(alpha, beta); + final BetaDistribution dist = new BetaDistribution(alpha, beta); for (int i = 0; i < CUMULATIVE_TEST_POINTS.length; i++) { - Assertions.assertEquals(1 - cumes[i], d.survivalProbability(CUMULATIVE_TEST_POINTS[i]), 1e-8); + Assertions.assertEquals(1 - cumes[i], dist.survivalProbability(CUMULATIVE_TEST_POINTS[i]), 1e-8); } } private static void checkCumulativeSurvivalComplement(double alpha, double beta) { - final BetaDistribution d = new BetaDistribution(alpha, beta); + final BetaDistribution dist = new BetaDistribution(alpha, beta); for (int i = 0; i < CUMULATIVE_TEST_POINTS.length; i++) { final double x = CUMULATIVE_TEST_POINTS[i]; - Assertions.assertEquals(1, d.cumulativeProbability(x) + d.survivalProbability(x), 1e-8); + Assertions.assertEquals(1, dist.cumulativeProbability(x) + dist.survivalProbability(x), 1e-8); } } private static void checkCumulativePrecision(double alpha, double beta, double value, double expected) { final double tolerance = 1e-22; - final BetaDistribution d = new BetaDistribution(alpha, beta); + final BetaDistribution dist = new BetaDistribution(alpha, beta); Assertions.assertEquals( - d.cumulativeProbability(value), + dist.cumulativeProbability(value), expected, tolerance, () -> "cumulative probability not precise at " + value + " for a=" + alpha + " & b=" + beta); @@ -256,9 +256,9 @@ class BetaDistributionTest { private static void checkSurvivalPrecision(double alpha, double beta, double value, double expected) { final double tolerance = 1e-22; - final BetaDistribution d = new BetaDistribution(alpha, beta); + final BetaDistribution dist = new BetaDistribution(alpha, beta); Assertions.assertEquals( - d.survivalProbability(value), + dist.survivalProbability(value), expected, tolerance, () -> "survival function not precise at " + value + " for a=" + alpha + " & b=" + beta); @@ -396,36 +396,36 @@ class BetaDistributionTest { @SuppressWarnings("boxing") private static void checkDensity(double alpha, double beta, double[] x, double[] expected) { - final BetaDistribution d = new BetaDistribution(alpha, beta); + final BetaDistribution dist = new BetaDistribution(alpha, beta); for (int i = 0; i < x.length; i++) { final int index = i; - Assertions.assertEquals(expected[i], d.density(x[i]), 1e-5, + Assertions.assertEquals(expected[i], dist.density(x[i]), 1e-5, () -> String.format("density at x=%.1f for alpha=%.1f, beta=%.1f", x[index], alpha, beta)); } } @Test void testDensityExtremes() { - final BetaDistribution d = new BetaDistribution(2, 3); - Assertions.assertEquals(Double.NEGATIVE_INFINITY, d.logDensity(-0.1)); - Assertions.assertEquals(Double.NEGATIVE_INFINITY, d.logDensity(1.1)); - Assertions.assertEquals(0.0, d.density(-0.1)); - Assertions.assertEquals(0.0, d.density(1.1)); - - Assertions.assertEquals(Double.NEGATIVE_INFINITY, d.logDensity(0.0)); - Assertions.assertEquals(Double.NEGATIVE_INFINITY, d.logDensity(1.0)); + final BetaDistribution dist = new BetaDistribution(2, 3); + Assertions.assertEquals(Double.NEGATIVE_INFINITY, dist.logDensity(-0.1)); + Assertions.assertEquals(Double.NEGATIVE_INFINITY, dist.logDensity(1.1)); + Assertions.assertEquals(0.0, dist.density(-0.1)); + Assertions.assertEquals(0.0, dist.density(1.1)); + + Assertions.assertEquals(Double.NEGATIVE_INFINITY, dist.logDensity(0.0)); + Assertions.assertEquals(Double.NEGATIVE_INFINITY, dist.logDensity(1.0)); } @Test void testLogDensityPrecondition1() { - final BetaDistribution d = new BetaDistribution(0.5, 3); - Assertions.assertThrows(DistributionException.class, () -> d.logDensity(0.0)); + final BetaDistribution dist = new BetaDistribution(0.5, 3); + Assertions.assertThrows(DistributionException.class, () -> dist.logDensity(0.0)); } @Test void testLogDensityPrecondition2() { - final BetaDistribution d = new BetaDistribution(2, 0.5); - Assertions.assertThrows(DistributionException.class, () -> d.logDensity(1.0)); + final BetaDistribution dist = new BetaDistribution(2, 0.5); + Assertions.assertThrows(DistributionException.class, () -> dist.logDensity(1.0)); } @Test diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/CauchyDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/CauchyDistributionTest.java index 080c90b..ca34644 100644 --- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/CauchyDistributionTest.java +++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/CauchyDistributionTest.java @@ -96,9 +96,9 @@ class CauchyDistributionTest extends ContinuousDistributionAbstractTest { @Test void testParameterAccessors() { - final CauchyDistribution distribution = makeDistribution(); - Assertions.assertEquals(1.2, distribution.getMedian()); - Assertions.assertEquals(2.1, distribution.getScale()); + final CauchyDistribution dist = makeDistribution(); + Assertions.assertEquals(1.2, dist.getMedian()); + Assertions.assertEquals(2.1, dist.getScale()); } @Test diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ChiSquaredDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ChiSquaredDistributionTest.java index 9d56815..08cbf61 100644 --- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ChiSquaredDistributionTest.java +++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ChiSquaredDistributionTest.java @@ -113,8 +113,8 @@ class ChiSquaredDistributionTest extends ContinuousDistributionAbstractTest { @Test void testParameterAccessors() { - final ChiSquaredDistribution distribution = makeDistribution(); - Assertions.assertEquals(5d, distribution.getDegreesOfFreedom()); + final ChiSquaredDistribution dist = makeDistribution(); + Assertions.assertEquals(5d, dist.getDegreesOfFreedom()); } @Test @@ -155,9 +155,9 @@ class ChiSquaredDistributionTest extends ContinuousDistributionAbstractTest { } private void checkDensity(double df, double[] x, double[] expected) { - final ChiSquaredDistribution d = new ChiSquaredDistribution(df); + final ChiSquaredDistribution dist = new ChiSquaredDistribution(df); for (int i = 0; i < x.length; i++) { - Assertions.assertEquals(expected[i], d.density(x[i]), 1e-5); + Assertions.assertEquals(expected[i], dist.density(x[i]), 1e-5); } } } diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ExponentialDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ExponentialDistributionTest.java index 1c7a703..17c029d 100644 --- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ExponentialDistributionTest.java +++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ExponentialDistributionTest.java @@ -126,8 +126,8 @@ class ExponentialDistributionTest extends ContinuousDistributionAbstractTest { @Test void testMeanAccessors() { - final ExponentialDistribution distribution = makeDistribution(); - Assertions.assertEquals(5d, distribution.getMean()); + final ExponentialDistribution dist = makeDistribution(); + Assertions.assertEquals(5d, dist.getMean()); } @Test diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GammaDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GammaDistributionTest.java index 691d8b1..0fb2654 100644 --- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GammaDistributionTest.java +++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GammaDistributionTest.java @@ -95,16 +95,16 @@ class GammaDistributionTest extends ContinuousDistributionAbstractTest { @Test void testDensityAtSupportBounds() { - final GammaDistribution distribution = makeDistribution(); - Assertions.assertEquals(0.0, distribution.density(0)); - Assertions.assertEquals(0.0, distribution.density(Double.POSITIVE_INFINITY)); + final GammaDistribution dist = makeDistribution(); + Assertions.assertEquals(0.0, dist.density(0)); + Assertions.assertEquals(0.0, dist.density(Double.POSITIVE_INFINITY)); } @Test void testParameterAccessors() { - final GammaDistribution distribution = makeDistribution(); - Assertions.assertEquals(4d, distribution.getShape()); - Assertions.assertEquals(2d, distribution.getScale()); + final GammaDistribution dist = makeDistribution(); + Assertions.assertEquals(4d, dist.getShape()); + Assertions.assertEquals(2d, dist.getScale()); } @Test @@ -184,9 +184,9 @@ class GammaDistributionTest extends ContinuousDistributionAbstractTest { } private void checkDensity(double alpha, double rate, double[] x, double[] expected) { - final GammaDistribution d = new GammaDistribution(alpha, 1 / rate); + final GammaDistribution dist = new GammaDistribution(alpha, 1 / rate); for (int i = 0; i < x.length; i++) { - Assertions.assertEquals(expected[i], d.density(x[i]), Math.abs(expected[i]) * 1e-5); + Assertions.assertEquals(expected[i], dist.density(x[i]), Math.abs(expected[i]) * 1e-5); } } @@ -216,9 +216,9 @@ class GammaDistributionTest extends ContinuousDistributionAbstractTest { } private void checkLogDensity(double alpha, double rate, double[] x, double[] expected) { - final GammaDistribution d = new GammaDistribution(alpha, 1 / rate); + final GammaDistribution dist = new GammaDistribution(alpha, 1 / rate); for (int i = 0; i < x.length; i++) { - Assertions.assertEquals(expected[i], d.logDensity(x[i]), Math.abs(expected[i]) * 1e-5); + Assertions.assertEquals(expected[i], dist.logDensity(x[i]), Math.abs(expected[i]) * 1e-5); } } diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GumbelDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GumbelDistributionTest.java index ea90adf..3eca9c1 100644 --- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GumbelDistributionTest.java +++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GumbelDistributionTest.java @@ -87,9 +87,9 @@ class GumbelDistributionTest extends ContinuousDistributionAbstractTest { @Test void testParameterAccessors() { - final GumbelDistribution d = makeDistribution(); - Assertions.assertEquals(0.5, d.getLocation()); - Assertions.assertEquals(2, d.getScale()); + final GumbelDistribution dist = makeDistribution(); + Assertions.assertEquals(0.5, dist.getLocation()); + Assertions.assertEquals(2, dist.getScale()); } @Test @@ -113,9 +113,9 @@ class GumbelDistributionTest extends ContinuousDistributionAbstractTest { @Test void testSupport() { - final GumbelDistribution d = makeDistribution(); - Assertions.assertEquals(Double.NEGATIVE_INFINITY, d.getSupportLowerBound()); - Assertions.assertEquals(Double.POSITIVE_INFINITY, d.getSupportUpperBound()); - Assertions.assertTrue(d.isSupportConnected()); + final GumbelDistribution dist = makeDistribution(); + Assertions.assertEquals(Double.NEGATIVE_INFINITY, dist.getSupportLowerBound()); + Assertions.assertEquals(Double.POSITIVE_INFINITY, dist.getSupportUpperBound()); + Assertions.assertTrue(dist.isSupportConnected()); } } diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LaplaceDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LaplaceDistributionTest.java index 117f4a1..326178d 100644 --- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LaplaceDistributionTest.java +++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LaplaceDistributionTest.java @@ -89,9 +89,9 @@ class LaplaceDistributionTest extends ContinuousDistributionAbstractTest { @Test void testParameterAccessors() { - final LaplaceDistribution d = makeDistribution(); - Assertions.assertEquals(0, d.getLocation()); - Assertions.assertEquals(1, d.getScale()); + final LaplaceDistribution dist = makeDistribution(); + Assertions.assertEquals(0, dist.getLocation()); + Assertions.assertEquals(1, dist.getScale()); } @Test @@ -114,9 +114,9 @@ class LaplaceDistributionTest extends ContinuousDistributionAbstractTest { @Test void testSupport() { - final LaplaceDistribution d = makeDistribution(); - Assertions.assertEquals(Double.NEGATIVE_INFINITY, d.getSupportLowerBound()); - Assertions.assertEquals(Double.POSITIVE_INFINITY, d.getSupportUpperBound()); - Assertions.assertTrue(d.isSupportConnected()); + final LaplaceDistribution dist = makeDistribution(); + Assertions.assertEquals(Double.NEGATIVE_INFINITY, dist.getSupportLowerBound()); + Assertions.assertEquals(Double.POSITIVE_INFINITY, dist.getSupportUpperBound()); + Assertions.assertTrue(dist.isSupportConnected()); } } diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LevyDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LevyDistributionTest.java index c85632c..e10d01b 100644 --- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LevyDistributionTest.java +++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LevyDistributionTest.java @@ -95,9 +95,9 @@ class LevyDistributionTest extends ContinuousDistributionAbstractTest { @Test void testParameterAccessors() { - final LevyDistribution d = makeDistribution(); - Assertions.assertEquals(1.2, d.getLocation()); - Assertions.assertEquals(0.4, d.getScale()); + final LevyDistribution dist = makeDistribution(); + Assertions.assertEquals(1.2, dist.getLocation()); + Assertions.assertEquals(0.4, dist.getScale()); } @Test @@ -119,9 +119,9 @@ class LevyDistributionTest extends ContinuousDistributionAbstractTest { @Test void testSupport() { - final LevyDistribution d = makeDistribution(); - Assertions.assertEquals(d.getLocation(), d.getSupportLowerBound()); - Assertions.assertEquals(Double.POSITIVE_INFINITY, d.getSupportUpperBound()); - Assertions.assertTrue(d.isSupportConnected()); + final LevyDistribution dist = makeDistribution(); + Assertions.assertEquals(dist.getLocation(), dist.getSupportLowerBound()); + Assertions.assertEquals(Double.POSITIVE_INFINITY, dist.getSupportUpperBound()); + Assertions.assertTrue(dist.isSupportConnected()); } } diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LogNormalDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LogNormalDistributionTest.java index 3a4e7fd..e6685f8 100644 --- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LogNormalDistributionTest.java +++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LogNormalDistributionTest.java @@ -234,9 +234,9 @@ class LogNormalDistributionTest extends ContinuousDistributionAbstractTest { double shape, double[] x, double[] expected) { - final LogNormalDistribution d = new LogNormalDistribution(scale, shape); + final LogNormalDistribution dist = new LogNormalDistribution(scale, shape); for (int i = 0; i < x.length; i++) { - Assertions.assertEquals(expected[i], d.density(x[i]), 1e-9); + Assertions.assertEquals(expected[i], dist.density(x[i]), 1e-9); } } @@ -246,9 +246,9 @@ class LogNormalDistributionTest extends ContinuousDistributionAbstractTest { */ @Test void testExtremeValues() { - final LogNormalDistribution d = new LogNormalDistribution(0, 1); + final LogNormalDistribution dist = new LogNormalDistribution(0, 1); for (int i = 0; i < 1e5; i++) { // make sure no convergence exception - final double upperTail = d.cumulativeProbability(i); + final double upperTail = dist.cumulativeProbability(i); if (i <= 72) { // make sure not top-coded Assertions.assertTrue(upperTail < 1.0d); } else { // make sure top coding not reversed @@ -256,10 +256,10 @@ class LogNormalDistributionTest extends ContinuousDistributionAbstractTest { } } - Assertions.assertEquals(1, d.cumulativeProbability(Double.MAX_VALUE)); - Assertions.assertEquals(0, d.cumulativeProbability(-Double.MAX_VALUE)); - Assertions.assertEquals(1, d.cumulativeProbability(Double.POSITIVE_INFINITY)); - Assertions.assertEquals(0, d.cumulativeProbability(Double.NEGATIVE_INFINITY)); + Assertions.assertEquals(1, dist.cumulativeProbability(Double.MAX_VALUE)); + Assertions.assertEquals(0, dist.cumulativeProbability(-Double.MAX_VALUE)); + Assertions.assertEquals(1, dist.cumulativeProbability(Double.POSITIVE_INFINITY)); + Assertions.assertEquals(0, dist.cumulativeProbability(Double.NEGATIVE_INFINITY)); } @Test diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LogisticDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LogisticDistributionTest.java index a6d1de5..b367283 100644 --- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LogisticDistributionTest.java +++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LogisticDistributionTest.java @@ -87,9 +87,9 @@ class LogisticDistributionTest extends ContinuousDistributionAbstractTest { @Test void testParametersAccessors() { - final LogisticDistribution d = makeDistribution(); - Assertions.assertEquals(2, d.getLocation()); - Assertions.assertEquals(5, d.getScale()); + final LogisticDistribution dist = makeDistribution(); + Assertions.assertEquals(2, dist.getLocation()); + Assertions.assertEquals(5, dist.getScale()); } @Test @@ -99,19 +99,19 @@ class LogisticDistributionTest extends ContinuousDistributionAbstractTest { @Test void testMeanAndVariance() { - final LogisticDistribution d = makeDistribution(); + final LogisticDistribution dist = makeDistribution(); // Constructor 'location' parameter = mean - Assertions.assertEquals(2.0, d.getMean()); + Assertions.assertEquals(2.0, dist.getMean()); // Variance = (s^2 * pi^2) / 3 // Constructor 'scale' parameter = s - Assertions.assertEquals(5 * 5 * Math.PI * Math.PI / 3, d.getVariance()); + Assertions.assertEquals(5 * 5 * Math.PI * Math.PI / 3, dist.getVariance()); } @Test void testSupport() { - final LogisticDistribution d = makeDistribution(); - Assertions.assertEquals(Double.NEGATIVE_INFINITY, d.getSupportLowerBound()); - Assertions.assertEquals(Double.POSITIVE_INFINITY, d.getSupportUpperBound()); - Assertions.assertTrue(d.isSupportConnected()); + final LogisticDistribution dist = makeDistribution(); + Assertions.assertEquals(Double.NEGATIVE_INFINITY, dist.getSupportLowerBound()); + Assertions.assertEquals(Double.POSITIVE_INFINITY, dist.getSupportUpperBound()); + Assertions.assertTrue(dist.isSupportConnected()); } } diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NakagamiDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NakagamiDistributionTest.java index a158c80..9382de0 100644 --- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NakagamiDistributionTest.java +++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NakagamiDistributionTest.java @@ -80,9 +80,9 @@ class NakagamiDistributionTest extends ContinuousDistributionAbstractTest { @Test void testParameterAccessors() { - final NakagamiDistribution d = makeDistribution(); - Assertions.assertEquals(0.5, d.getShape()); - Assertions.assertEquals(1, d.getScale()); + final NakagamiDistribution dist = makeDistribution(); + Assertions.assertEquals(0.5, dist.getShape()); + Assertions.assertEquals(1, dist.getScale()); } @Test @@ -115,9 +115,9 @@ class NakagamiDistributionTest extends ContinuousDistributionAbstractTest { @Test void testSupport() { - final NakagamiDistribution d = makeDistribution(); - Assertions.assertEquals(0, d.getSupportLowerBound()); - Assertions.assertEquals(Double.POSITIVE_INFINITY, d.getSupportUpperBound()); - Assertions.assertTrue(d.isSupportConnected()); + final NakagamiDistribution dist = makeDistribution(); + Assertions.assertEquals(0, dist.getSupportLowerBound()); + Assertions.assertEquals(Double.POSITIVE_INFINITY, dist.getSupportUpperBound()); + Assertions.assertTrue(dist.isSupportConnected()); } } diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NormalDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NormalDistributionTest.java index 8d5747d..75fedf3 100644 --- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NormalDistributionTest.java +++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NormalDistributionTest.java @@ -180,9 +180,9 @@ class NormalDistributionTest extends ContinuousDistributionAbstractTest { } private void checkDensity(double mean, double sd, double[] x, double[] expected) { - final NormalDistribution d = new NormalDistribution(mean, sd); + final NormalDistribution dist = new NormalDistribution(mean, sd); for (int i = 0; i < x.length; i++) { - Assertions.assertEquals(expected[i], d.density(x[i]), 1e-9); + Assertions.assertEquals(expected[i], dist.density(x[i]), 1e-9); } } diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ParetoDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ParetoDistributionTest.java index 93a9316..b54bcd7 100644 --- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ParetoDistributionTest.java +++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ParetoDistributionTest.java @@ -184,9 +184,9 @@ class ParetoDistributionTest extends ContinuousDistributionAbstractTest { private void checkDensity(double scale, double shape, double[] x, double[] expected) { - final ParetoDistribution d = new ParetoDistribution(scale, shape); + final ParetoDistribution dist = new ParetoDistribution(scale, shape); for (int i = 0; i < x.length; i++) { - Assertions.assertEquals(expected[i], d.density(x[i]), 1e-9); + Assertions.assertEquals(expected[i], dist.density(x[i]), 1e-9); } } @@ -195,9 +195,9 @@ class ParetoDistributionTest extends ContinuousDistributionAbstractTest { */ @Test void testExtremeValues() { - final ParetoDistribution d = new ParetoDistribution(1, 1); + final ParetoDistribution dist = new ParetoDistribution(1, 1); for (int i = 0; i < 1e5; i++) { // make sure no convergence exception - final double upperTail = d.cumulativeProbability(i); + final double upperTail = dist.cumulativeProbability(i); if (i <= 1000) { // make sure not top-coded Assertions.assertTrue(upperTail < 1.0d); } else { // make sure top coding not reversed @@ -205,9 +205,9 @@ class ParetoDistributionTest extends ContinuousDistributionAbstractTest { } } - Assertions.assertEquals(1, d.cumulativeProbability(Double.MAX_VALUE)); - Assertions.assertEquals(0, d.cumulativeProbability(-Double.MAX_VALUE)); - Assertions.assertEquals(1, d.cumulativeProbability(Double.POSITIVE_INFINITY)); - Assertions.assertEquals(0, d.cumulativeProbability(Double.NEGATIVE_INFINITY)); + Assertions.assertEquals(1, dist.cumulativeProbability(Double.MAX_VALUE)); + Assertions.assertEquals(0, dist.cumulativeProbability(-Double.MAX_VALUE)); + Assertions.assertEquals(1, dist.cumulativeProbability(Double.POSITIVE_INFINITY)); + Assertions.assertEquals(0, dist.cumulativeProbability(Double.NEGATIVE_INFINITY)); } } diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PascalDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PascalDistributionTest.java index 00f68a5..ecac3e8 100644 --- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PascalDistributionTest.java +++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PascalDistributionTest.java @@ -129,9 +129,9 @@ class PascalDistributionTest extends DiscreteDistributionAbstractTest { @Test void testParameterAccessors() { - final PascalDistribution distribution = makeDistribution(); - Assertions.assertEquals(10, distribution.getNumberOfSuccesses()); - Assertions.assertEquals(0.7, distribution.getProbabilityOfSuccess()); + final PascalDistribution dist = makeDistribution(); + Assertions.assertEquals(10, dist.getNumberOfSuccesses()); + Assertions.assertEquals(0.7, dist.getProbabilityOfSuccess()); } @Test diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TriangularDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TriangularDistributionTest.java index 09a5ac2..32664b4 100644 --- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TriangularDistributionTest.java +++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TriangularDistributionTest.java @@ -116,15 +116,15 @@ class TriangularDistributionTest extends ContinuousDistributionAbstractTest { /** Test lower bound getter. */ @Test void testGetLowerBound() { - final TriangularDistribution distribution = makeDistribution(); - Assertions.assertEquals(-3.0, distribution.getSupportLowerBound()); + final TriangularDistribution dist = makeDistribution(); + Assertions.assertEquals(-3.0, dist.getSupportLowerBound()); } /** Test upper bound getter. */ @Test void testGetUpperBound() { - final TriangularDistribution distribution = makeDistribution(); - Assertions.assertEquals(12.0, distribution.getSupportUpperBound()); + final TriangularDistribution dist = makeDistribution(); + Assertions.assertEquals(12.0, dist.getSupportUpperBound()); } @Test diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformContinuousDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformContinuousDistributionTest.java index b2fe83e..5e5c541 100644 --- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformContinuousDistributionTest.java +++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformContinuousDistributionTest.java @@ -65,15 +65,15 @@ class UniformContinuousDistributionTest extends ContinuousDistributionAbstractTe /** Test lower bound getter. */ @Test void testGetLowerBound() { - final UniformContinuousDistribution distribution = makeDistribution(); - Assertions.assertEquals(-0.5, distribution.getSupportLowerBound()); + final UniformContinuousDistribution dist = makeDistribution(); + Assertions.assertEquals(-0.5, dist.getSupportLowerBound()); } /** Test upper bound getter. */ @Test void testGetUpperBound() { - final UniformContinuousDistribution distribution = makeDistribution(); - Assertions.assertEquals(1.25, distribution.getSupportUpperBound()); + final UniformContinuousDistribution dist = makeDistribution(); + Assertions.assertEquals(1.25, dist.getSupportUpperBound()); } /** Test pre-condition for equal lower/upper bound. */ diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/WeibullDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/WeibullDistributionTest.java index ee4da66..81f4e0b 100644 --- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/WeibullDistributionTest.java +++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/WeibullDistributionTest.java @@ -85,9 +85,9 @@ class WeibullDistributionTest extends ContinuousDistributionAbstractTest { @Test void testDensityAtSupportBounds() { - final WeibullDistribution distribution = makeDistribution(); - Assertions.assertEquals(0.0, distribution.density(0)); - Assertions.assertEquals(0.0, distribution.density(Double.POSITIVE_INFINITY)); + final WeibullDistribution dist = makeDistribution(); + Assertions.assertEquals(0.0, dist.density(0)); + Assertions.assertEquals(0.0, dist.density(Double.POSITIVE_INFINITY)); } @Test diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ZipfDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ZipfDistributionTest.java index bd3c2db..916ee5c 100644 --- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ZipfDistributionTest.java +++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ZipfDistributionTest.java @@ -90,9 +90,9 @@ class ZipfDistributionTest extends DiscreteDistributionAbstractTest { @Test void testParameterAccessors() { - final ZipfDistribution distribution = makeDistribution(); - Assertions.assertEquals(10, distribution.getNumberOfElements()); - Assertions.assertEquals(1.0, distribution.getExponent()); + final ZipfDistribution dist = makeDistribution(); + Assertions.assertEquals(10, dist.getNumberOfElements()); + Assertions.assertEquals(1.0, dist.getExponent()); } @Test