You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ah...@apache.org on 2021/09/20 17:07:58 UTC
[commons-statistics] 10/13: Do not use test set-up and tear down
fixtures
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 7c20e10dc0aee272b17a4ed11c813fbe44a8d0a2
Author: aherbert <ah...@apache.org>
AuthorDate: Mon Sep 20 16:40:01 2021 +0100
Do not use test set-up and tear down fixtures
The required data is generated in the specific test.
This detected that the HypergeometricDistributionTest was not testing
the high-precision cumulative probability points.
The TearDown fixture is not required as the default JUnit 5 lifecycle is
a new instance per test.
---
.../distribution/BinomialDistributionTest.java | 3 +
.../distribution/CauchyDistributionTest.java | 1 +
.../distribution/ChiSquaredDistributionTest.java | 1 +
.../ContinuousDistributionAbstractTest.java | 79 ++++++++++------------
.../DiscreteDistributionAbstractTest.java | 74 +++++++++-----------
.../distribution/ExponentialDistributionTest.java | 4 +-
.../statistics/distribution/FDistributionTest.java | 2 +
.../distribution/GammaDistributionTest.java | 1 +
.../distribution/GumbelDistributionTest.java | 1 +
.../HypergeometricDistributionTest.java | 2 +-
.../distribution/LaplaceDistributionTest.java | 1 +
.../distribution/LogNormalDistributionTest.java | 4 +-
.../distribution/LogisticDistributionTest.java | 1 +
.../distribution/NormalDistributionTest.java | 2 +
.../distribution/ParetoDistributionTest.java | 4 +-
.../statistics/distribution/TDistributionTest.java | 3 +
.../distribution/WeibullDistributionTest.java | 1 +
17 files changed, 95 insertions(+), 89 deletions(-)
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BinomialDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BinomialDistributionTest.java
index 88c599f..9aa2b7b 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BinomialDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BinomialDistributionTest.java
@@ -83,15 +83,18 @@ class BinomialDistributionTest extends DiscreteDistributionAbstractTest {
void testSmallPValue() {
final BinomialDistribution dist = new BinomialDistribution(10, 0.3);
setDistribution(dist);
+ setCumulativeTestPoints(makeCumulativeTestPoints());
// computed using R version 3.4.4
setCumulativeTestValues(new double[] {0.00000000000000000000, 0.02824752489999998728, 0.14930834590000002793,
0.38278278639999974153, 0.64961071840000017552, 0.84973166740000016794, 0.95265101260000006889,
0.98940792160000001765, 0.99840961360000002323, 0.99985631409999997654, 0.99999409509999992451,
1.00000000000000000000, 1.00000000000000000000});
+ setProbabilityTestPoints(makeProbabilityTestPoints());
setProbabilityTestValues(new double[] {0.0000000000000000000e+00, 2.8247524899999980341e-02,
1.2106082099999991575e-01, 2.3347444049999999116e-01, 2.6682793199999993439e-01, 2.0012094900000007569e-01,
1.0291934520000002584e-01, 3.6756909000000004273e-02, 9.0016919999999864960e-03, 1.4467005000000008035e-03,
1.3778099999999990615e-04, 5.9048999999999949131e-06, 0.0000000000000000000e+00});
+ setInverseCumulativeTestPoints(makeInverseCumulativeTestPoints());
setInverseCumulativeTestValues(new int[] {0, 0, 0, 0, 1, 1, 8, 7, 6, 5, 5, 10});
verifyProbabilities();
verifyLogProbabilities();
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 74f8a2f..cc0e47a 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
@@ -91,6 +91,7 @@ class CauchyDistributionTest extends ContinuousDistributionAbstractTest {
@Test
void testInverseCumulativeProbabilityExtremes() {
+ setDistribution(makeDistribution());
setInverseCumulativeTestPoints(new double[] {0.0, 1.0});
setInverseCumulativeTestValues(new double[] {Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY});
verifyInverseCumulativeProbabilities();
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 08cbf61..082a9ea 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
@@ -105,6 +105,7 @@ class ChiSquaredDistributionTest extends ContinuousDistributionAbstractTest {
setCumulativeTestPoints(new double[] {1.168926E-60, 1.168926E-40, 1.063132E-32,
1.144775E-26, 1.168926E-20, 5.472917, 2.175255, 1.13438,
0.5318646, 0.1526342});
+ setCumulativeTestValues(makeCumulativeTestValues());
setInverseCumulativeTestValues(getCumulativeTestPoints());
setInverseCumulativeTestPoints(getCumulativeTestValues());
verifyCumulativeProbabilities();
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ContinuousDistributionAbstractTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ContinuousDistributionAbstractTest.java
index 6092ff7..20dca4c 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ContinuousDistributionAbstractTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ContinuousDistributionAbstractTest.java
@@ -26,9 +26,7 @@ import org.apache.commons.math3.analysis.integration.IterativeLegendreGaussInteg
import org.apache.commons.math3.util.MathArrays;
import org.apache.commons.rng.simple.RandomSource;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
/**
* Abstract base class for {@link ContinuousDistribution} tests.
@@ -191,47 +189,6 @@ abstract class ContinuousDistributionAbstractTest {
return makeCumulativeTestPoints();
}
- //-------------------- Setup / tear down ----------------------------------
-
- /**
- * Setup sets all test instance data to default values.
- * <p>
- * This method is @BeforeEach (created for each test) as certain test methods may wish
- * to alter the defaults.
- */
- @BeforeEach
- void setUp() {
- distribution = makeDistribution();
- densityTestValues = makeDensityTestValues();
- logDensityTestValues = makeLogDensityTestValues();
- cumulativeTestPoints = makeCumulativeTestPoints();
- cumulativeTestValues = makeCumulativeTestValues();
- cumulativePrecisionTestPoints = makeCumulativePrecisionTestPoints();
- cumulativePrecisionTestValues = makeCumulativePrecisionTestValues();
- survivalPrecisionTestPoints = makeSurvivalPrecisionTestPoints();
- survivalPrecisionTestValues = makeSurvivalPrecisionTestValues();
- inverseCumulativeTestPoints = makeInverseCumulativeTestPoints();
- inverseCumulativeTestValues = makeInverseCumulativeTestValues();
- }
-
- /**
- * Cleans up test instance data.
- */
- @AfterEach
- void tearDown() {
- distribution = null;
- densityTestValues = null;
- logDensityTestValues = null;
- cumulativeTestPoints = null;
- cumulativeTestValues = null;
- cumulativePrecisionTestPoints = null;
- cumulativePrecisionTestValues = null;
- survivalPrecisionTestPoints = null;
- survivalPrecisionTestValues = null;
- inverseCumulativeTestPoints = null;
- inverseCumulativeTestValues = null;
- }
-
//-------------------- Verification methods -------------------------------
/**
@@ -436,41 +393,64 @@ abstract class ContinuousDistributionAbstractTest {
@Test
void testDensities() {
+ distribution = makeDistribution();
+ cumulativeTestPoints = makeCumulativeTestPoints();
+ densityTestValues = makeDensityTestValues();
verifyDensities();
}
@Test
void testLogDensities() {
+ distribution = makeDistribution();
+ cumulativeTestPoints = makeCumulativeTestPoints();
+ logDensityTestValues = makeLogDensityTestValues();
verifyLogDensities();
}
@Test
void testCumulativeProbabilities() {
+ distribution = makeDistribution();
+ cumulativeTestPoints = makeCumulativeTestPoints();
+ cumulativeTestValues = makeCumulativeTestValues();
verifyCumulativeProbabilities();
}
@Test
void testSurvivalProbability() {
+ distribution = makeDistribution();
+ cumulativeTestPoints = makeCumulativeTestPoints();
+ cumulativeTestValues = makeCumulativeTestValues();
verifySurvivalProbability();
}
@Test
void testSurvivalAndCumulativeProbabilitiesAreComplementary() {
+ distribution = makeDistribution();
+ cumulativeTestPoints = makeCumulativeTestPoints();
verifySurvivalAndCumulativeProbabilityComplement();
}
@Test
void testCumulativeProbabilityPrecision() {
+ distribution = makeDistribution();
+ cumulativePrecisionTestPoints = makeCumulativePrecisionTestPoints();
+ cumulativePrecisionTestValues = makeCumulativePrecisionTestValues();
verifyCumulativeProbabilityPrecision();
}
@Test
void testSurvivalProbabilityPrecision() {
+ distribution = makeDistribution();
+ survivalPrecisionTestPoints = makeSurvivalPrecisionTestPoints();
+ survivalPrecisionTestValues = makeSurvivalPrecisionTestValues();
verifySurvivalProbabilityPrecision();
}
@Test
void testInverseCumulativeProbabilities() {
+ distribution = makeDistribution();
+ inverseCumulativeTestPoints = makeInverseCumulativeTestPoints();
+ inverseCumulativeTestValues = makeInverseCumulativeTestValues();
verifyInverseCumulativeProbabilities();
}
@@ -479,6 +459,8 @@ abstract class ContinuousDistributionAbstractTest {
*/
@Test
void testConsistency() {
+ distribution = makeDistribution();
+ cumulativeTestPoints = makeCumulativeTestPoints();
for (int i = 1; i < cumulativeTestPoints.length; i++) {
// check that cdf(x, x) = 0
@@ -500,6 +482,8 @@ abstract class ContinuousDistributionAbstractTest {
@Test
void testOutsideSupport() {
+ distribution = makeDistribution();
+
// Test various quantities when the variable is outside the support.
final double lo = distribution.getSupportLowerBound();
Assertions.assertEquals(lo, distribution.inverseCumulativeProbability(0.0));
@@ -523,21 +507,25 @@ abstract class ContinuousDistributionAbstractTest {
@Test
void testProbabilityWithLowerBoundAboveUpperBound() {
+ distribution = makeDistribution();
Assertions.assertThrows(DistributionException.class, () -> distribution.probability(1, 0));
}
@Test
void testInverseCumulativeProbabilityWithProbabilityBelowZero() {
+ distribution = makeDistribution();
Assertions.assertThrows(DistributionException.class, () -> distribution.inverseCumulativeProbability(-1));
}
@Test
void testInverseCumulativeProbabilityWithProbabilityAboveOne() {
+ distribution = makeDistribution();
Assertions.assertThrows(DistributionException.class, () -> distribution.inverseCumulativeProbability(2));
}
@Test
void testSampling() {
+ distribution = makeDistribution();
final double[] quartiles = TestUtils.getDistributionQuartiles(getDistribution());
final double[] expected = {0.25, 0.25, 0.25, 0.25};
@@ -567,6 +555,10 @@ abstract class ContinuousDistributionAbstractTest {
*/
@Test
void testDensityIntegrals() {
+ distribution = makeDistribution();
+ cumulativeTestPoints = makeCumulativeTestPoints();
+ cumulativeTestValues = makeCumulativeTestValues();
+
final double tol = 1e-9;
final BaseAbstractUnivariateIntegrator integrator =
new IterativeLegendreGaussIntegrator(5, 1e-12, 1e-10);
@@ -601,6 +593,7 @@ abstract class ContinuousDistributionAbstractTest {
*/
@Test
void testIsSupportConnected() {
+ distribution = makeDistribution();
Assertions.assertEquals(isSupportConnected(), distribution.isSupportConnected());
}
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/DiscreteDistributionAbstractTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/DiscreteDistributionAbstractTest.java
index a1e5428..3aaf8af 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/DiscreteDistributionAbstractTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/DiscreteDistributionAbstractTest.java
@@ -19,9 +19,7 @@ package org.apache.commons.statistics.distribution;
import java.util.Arrays;
import org.apache.commons.math3.util.MathArrays;
import org.apache.commons.rng.simple.RandomSource;
-import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/**
@@ -186,46 +184,6 @@ abstract class DiscreteDistributionAbstractTest {
/** Creates the default inverse cumulative probability density test expected values. */
public abstract int[] makeInverseCumulativeTestValues();
- //-------------------- Setup / tear down ----------------------------------
-
- /**
- * Setup sets all test instance data to default values.
- */
- @BeforeEach
- void setUp() {
- distribution = makeDistribution();
- probabilityTestPoints = makeProbabilityTestPoints();
- probabilityTestValues = makeProbabilityTestValues();
- logProbabilityTestValues = makeLogProbabilityTestValues();
- cumulativeTestPoints = makeCumulativeTestPoints();
- cumulativeTestValues = makeCumulativeTestValues();
- cumulativePrecisionTestPoints = makeCumulativePrecisionTestPoints();
- cumulativePrecisionTestValues = makeCumulativePrecisionTestValues();
- survivalPrecisionTestPoints = makeSurvivalPrecisionTestPoints();
- survivalPrecisionTestValues = makeSurvivalPrecisionTestValues();
- inverseCumulativeTestPoints = makeInverseCumulativeTestPoints();
- inverseCumulativeTestValues = makeInverseCumulativeTestValues();
- }
-
- /**
- * Cleans up test instance data
- */
- @AfterEach
- void tearDown() {
- distribution = null;
- probabilityTestPoints = null;
- probabilityTestValues = null;
- logProbabilityTestValues = null;
- cumulativeTestPoints = null;
- cumulativeTestValues = null;
- cumulativePrecisionTestPoints = null;
- cumulativePrecisionTestValues = null;
- survivalPrecisionTestPoints = null;
- survivalPrecisionTestValues = null;
- inverseCumulativeTestPoints = null;
- inverseCumulativeTestValues = null;
- }
-
//-------------------- Verification methods -------------------------------
/**
@@ -426,41 +384,64 @@ abstract class DiscreteDistributionAbstractTest {
@Test
void testProbabilities() {
+ distribution = makeDistribution();
+ probabilityTestPoints = makeProbabilityTestPoints();
+ probabilityTestValues = makeProbabilityTestValues();
verifyProbabilities();
}
@Test
void testLogProbabilities() {
+ distribution = makeDistribution();
+ probabilityTestPoints = makeProbabilityTestPoints();
+ logProbabilityTestValues = makeLogProbabilityTestValues();
verifyLogProbabilities();
}
@Test
void testCumulativeProbabilities() {
+ distribution = makeDistribution();
+ cumulativeTestPoints = makeCumulativeTestPoints();
+ cumulativeTestValues = makeCumulativeTestValues();
verifyCumulativeProbabilities();
}
@Test
void testSurvivalProbability() {
+ distribution = makeDistribution();
+ cumulativeTestPoints = makeCumulativeTestPoints();
+ cumulativeTestValues = makeCumulativeTestValues();
verifySurvivalProbability();
}
@Test
void testSurvivalAndCumulativeProbabilitiesAreComplementary() {
+ distribution = makeDistribution();
+ cumulativeTestPoints = makeCumulativeTestPoints();
verifySurvivalAndCumulativeProbabilityComplement();
}
@Test
void testCumulativeProbabilityPrecision() {
+ distribution = makeDistribution();
+ cumulativePrecisionTestPoints = makeCumulativePrecisionTestPoints();
+ cumulativePrecisionTestValues = makeCumulativePrecisionTestValues();
verifyCumulativeProbabilityPrecision();
}
@Test
void testSurvivalProbabilityPrecision() {
+ distribution = makeDistribution();
+ survivalPrecisionTestPoints = makeSurvivalPrecisionTestPoints();
+ survivalPrecisionTestValues = makeSurvivalPrecisionTestValues();
verifySurvivalProbabilityPrecision();
}
@Test
void testInverseCumulativeProbabilities() {
+ distribution = makeDistribution();
+ inverseCumulativeTestPoints = makeInverseCumulativeTestPoints();
+ inverseCumulativeTestValues = makeInverseCumulativeTestValues();
verifyInverseCumulativeProbabilities();
}
@@ -469,6 +450,8 @@ abstract class DiscreteDistributionAbstractTest {
*/
@Test
void testConsistency() {
+ distribution = makeDistribution();
+ cumulativeTestPoints = makeCumulativeTestPoints();
for (int i = 1; i < cumulativeTestPoints.length; i++) {
// check that cdf(x, x) = 0
@@ -490,6 +473,8 @@ abstract class DiscreteDistributionAbstractTest {
@Test
void testOutsideSupport() {
+ distribution = makeDistribution();
+
// Test various quantities when the variable is outside the support.
final int lo = distribution.getSupportLowerBound();
Assertions.assertEquals(distribution.probability(lo), distribution.cumulativeProbability(lo), getTolerance());
@@ -524,21 +509,25 @@ abstract class DiscreteDistributionAbstractTest {
@Test
void testProbabilityWithLowerBoundAboveUpperBound() {
+ distribution = makeDistribution();
Assertions.assertThrows(DistributionException.class, () -> distribution.probability(1, 0));
}
@Test
void testInverseCumulativeProbabilityWithProbabilityBelowZero() {
+ distribution = makeDistribution();
Assertions.assertThrows(DistributionException.class, () -> distribution.inverseCumulativeProbability(-1));
}
@Test
void testInverseCumulativeProbabilityWithProbabilityAboveOne() {
+ distribution = makeDistribution();
Assertions.assertThrows(DistributionException.class, () -> distribution.inverseCumulativeProbability(2));
}
@Test
void testSampling() {
+ distribution = makeDistribution();
// This test uses the points that are used to test the distribution PMF.
// The sum of the probability values does not have to be 1 (or very close to 1).
// Any value generated by the sampler that is not an expected point will
@@ -586,6 +575,7 @@ abstract class DiscreteDistributionAbstractTest {
*/
@Test
void testIsSupportConnected() {
+ distribution = makeDistribution();
Assertions.assertEquals(isSupportConnected(), distribution.isSupportConnected());
}
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 17c029d..6903108 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
@@ -88,6 +88,7 @@ class ExponentialDistributionTest extends ContinuousDistributionAbstractTest {
@Test
void testCumulativeProbabilityExtremes() {
+ setDistribution(makeDistribution());
setCumulativeTestPoints(new double[] {-2, 0});
setCumulativeTestValues(new double[] {0, 0});
verifyCumulativeProbabilities();
@@ -95,6 +96,7 @@ class ExponentialDistributionTest extends ContinuousDistributionAbstractTest {
@Test
void testInverseCumulativeProbabilityExtremes() {
+ setDistribution(makeDistribution());
setInverseCumulativeTestPoints(new double[] {0, 1});
setInverseCumulativeTestValues(new double[] {0, Double.POSITIVE_INFINITY});
verifyInverseCumulativeProbabilities();
@@ -102,7 +104,7 @@ class ExponentialDistributionTest extends ContinuousDistributionAbstractTest {
@Test
void testCumulativeProbability2() {
- final double actual = getDistribution().probability(0.25, 0.75);
+ final double actual = makeDistribution().probability(0.25, 0.75);
Assertions.assertEquals(0.0905214, actual, 10e-4);
}
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/FDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/FDistributionTest.java
index 38b38f1..ea19de0 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/FDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/FDistributionTest.java
@@ -85,6 +85,7 @@ class FDistributionTest extends ContinuousDistributionAbstractTest {
@Test
void testCumulativeProbabilityExtremes() {
+ setDistribution(makeDistribution());
setCumulativeTestPoints(new double[] {-2, 0});
setCumulativeTestValues(new double[] {0, 0});
verifyCumulativeProbabilities();
@@ -92,6 +93,7 @@ class FDistributionTest extends ContinuousDistributionAbstractTest {
@Test
void testInverseCumulativeProbabilityExtremes() {
+ setDistribution(makeDistribution());
setInverseCumulativeTestPoints(new double[] {0, 1});
setInverseCumulativeTestValues(new double[] {0, Double.POSITIVE_INFINITY});
verifyInverseCumulativeProbabilities();
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 ad0451c..9d89eea 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
@@ -224,6 +224,7 @@ class GammaDistributionTest extends ContinuousDistributionAbstractTest {
@Test
void testInverseCumulativeProbabilityExtremes() {
+ setDistribution(makeDistribution());
setInverseCumulativeTestPoints(new double[] {0, 1});
setInverseCumulativeTestValues(new double[] {0, Double.POSITIVE_INFINITY});
verifyInverseCumulativeProbabilities();
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 3eca9c1..71275ad 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
@@ -80,6 +80,7 @@ class GumbelDistributionTest extends ContinuousDistributionAbstractTest {
@Test
void testInverseCumulativeProbabilityExtremes() {
+ setDistribution(makeDistribution());
setInverseCumulativeTestPoints(new double[] {0.0, 1.0});
setInverseCumulativeTestValues(new double[] {Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY});
verifyInverseCumulativeProbabilities();
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/HypergeometricDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/HypergeometricDistributionTest.java
index 21ce1f0..8b29ffd 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/HypergeometricDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/HypergeometricDistributionTest.java
@@ -346,7 +346,7 @@ class HypergeometricDistributionTest extends DiscreteDistributionAbstractTest {
setDistribution(new HypergeometricDistribution(500, 70, 300));
setCumulativePrecisionTestPoints(new int[] {10, 8});
setCumulativePrecisionTestValues(new double[] {2.4055720603264525e-17, 1.2848174992266236e-19});
- verifySurvivalProbabilityPrecision();
+ verifyCumulativeProbabilityPrecision();
}
@Test
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 326178d..0af06cf 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
@@ -82,6 +82,7 @@ class LaplaceDistributionTest extends ContinuousDistributionAbstractTest {
@Test
void testInverseCumulativeProbabilityExtremes() {
+ setDistribution(makeDistribution());
setInverseCumulativeTestPoints(new double[] {0.0, 1.0});
setInverseCumulativeTestValues(new double[] {Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY});
verifyInverseCumulativeProbabilities();
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 d44d960..c2d24d3 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
@@ -127,6 +127,7 @@ class LogNormalDistributionTest extends ContinuousDistributionAbstractTest {
@Test
void testQuantiles() {
+ setDistribution(makeDistribution());
setCumulativeTestValues(new double[] {0, 0.0396495152787,
0.16601209243, 0.272533253269,
0.357618409638, 0.426488363093,
@@ -164,6 +165,7 @@ class LogNormalDistributionTest extends ContinuousDistributionAbstractTest {
@Test
void testInverseCumulativeProbabilityExtremes() {
+ setDistribution(makeDistribution());
setInverseCumulativeTestPoints(new double[] {0, 1});
setInverseCumulativeTestValues(new double[] {0, Double.POSITIVE_INFINITY});
verifyInverseCumulativeProbabilities();
@@ -189,7 +191,7 @@ class LogNormalDistributionTest extends ContinuousDistributionAbstractTest {
@Test
void testParameterAccessors() {
- final LogNormalDistribution distribution = (LogNormalDistribution)getDistribution();
+ final LogNormalDistribution distribution = makeDistribution();
Assertions.assertEquals(2.1, distribution.getMu());
Assertions.assertEquals(1.4, distribution.getSigma());
}
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 25b5c51..40d9c30 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
@@ -90,6 +90,7 @@ class LogisticDistributionTest extends ContinuousDistributionAbstractTest {
@Test
void testInverseCumulativeProbabilityExtremes() {
+ setDistribution(makeDistribution());
setInverseCumulativeTestPoints(new double[] {0, 1});
setInverseCumulativeTestValues(new double[] {Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY});
verifyInverseCumulativeProbabilities();
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 75fedf3..c6cc57a 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
@@ -104,6 +104,7 @@ class NormalDistributionTest extends ContinuousDistributionAbstractTest {
@Test
void testQuantiles() {
+ setDistribution(makeDistribution());
setDensityTestValues(new double[] {0.0385649760808, 0.172836231799, 0.284958771715, 0.172836231799, 0.0385649760808,
0.00316560600853, 9.55930184035e-05, 1.06194251052e-06});
verifyQuantiles();
@@ -124,6 +125,7 @@ class NormalDistributionTest extends ContinuousDistributionAbstractTest {
@Test
void testInverseCumulativeProbabilityExtremes() {
+ setDistribution(makeDistribution());
setInverseCumulativeTestPoints(new double[] {0, 1});
setInverseCumulativeTestValues(new double[] {Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY});
verifyInverseCumulativeProbabilities();
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 b54bcd7..12ecc6b 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
@@ -117,6 +117,7 @@ class ParetoDistributionTest extends ContinuousDistributionAbstractTest {
@Test
void testQuantiles() {
+ setDistribution(makeDistribution());
setCumulativeTestValues(new double[] {0, 0, 0, 0.510884134236, 0.694625688662, 0.785201995008, 0.837811522357, 0.871634279326});
setDensityTestValues(new double[] {0, 0, 0.666666666, 0.195646346305, 0.0872498032394, 0.0477328899983, 0.0294888141169, 0.0197485724114});
verifyQuantiles();
@@ -137,6 +138,7 @@ class ParetoDistributionTest extends ContinuousDistributionAbstractTest {
@Test
void testInverseCumulativeProbabilityExtremes() {
+ setDistribution(makeDistribution());
setInverseCumulativeTestPoints(new double[] {0, 1});
setInverseCumulativeTestValues(new double[] {2.1, Double.POSITIVE_INFINITY});
verifyInverseCumulativeProbabilities();
@@ -144,7 +146,7 @@ class ParetoDistributionTest extends ContinuousDistributionAbstractTest {
@Test
void testParameterAccessors() {
- final ParetoDistribution distribution = (ParetoDistribution)getDistribution();
+ final ParetoDistribution distribution = makeDistribution();
Assertions.assertEquals(2.1, distribution.getScale());
Assertions.assertEquals(1.4, distribution.getShape());
}
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TDistributionTest.java
index be1635d..93ecdc8 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TDistributionTest.java
@@ -104,10 +104,12 @@ class TDistributionTest extends ContinuousDistributionAbstractTest {
-6.31375151468, -3.07768353718, 318.308838986,
31.8205159538, 12.7062047362, 6.31375151468,
3.07768353718});
+ setCumulativeTestValues(makeCumulativeTestValues());
setDensityTestValues(new double[] {3.14158231817e-06, 0.000314055924703, 0.00195946145194,
0.00778959736375, 0.0303958893917, 3.14158231817e-06,
0.000314055924703, 0.00195946145194, 0.00778959736375,
0.0303958893917});
+ setInverseCumulativeTestPoints(getCumulativeTestValues());
setInverseCumulativeTestValues(getCumulativeTestPoints());
verifyCumulativeProbabilities();
verifyInverseCumulativeProbabilities();
@@ -116,6 +118,7 @@ class TDistributionTest extends ContinuousDistributionAbstractTest {
@Test
void testInverseCumulativeProbabilityExtremes() {
+ setDistribution(makeDistribution());
setInverseCumulativeTestPoints(new double[] {0, 1});
setInverseCumulativeTestValues(new double[] {Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY});
verifyInverseCumulativeProbabilities();
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 81f4e0b..6b1e28e 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
@@ -102,6 +102,7 @@ class WeibullDistributionTest extends ContinuousDistributionAbstractTest {
@Test
void testInverseCumulativeProbabilityExtremes() {
+ setDistribution(makeDistribution());
setInverseCumulativeTestPoints(new double[] {0.0, 1.0});
setInverseCumulativeTestValues(new double[] {0.0, Double.POSITIVE_INFINITY});
verifyInverseCumulativeProbabilities();