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 938a30ad0d1961acae8254109131aca866804a06
Author: aherbert <aherb...@apache.org>
AuthorDate: Fri Jul 30 16:05:14 2021 +0100
Rename density to probability to match the DiscreteDistribution
---
.../distribution/BinomialDistributionTest.java | 36 +++----
.../DiscreteDistributionAbstractTest.java | 110 ++++++++++-----------
.../distribution/GeometricDistributionTest.java | 12 +--
.../HypergeometricDistributionTest.java | 32 +++---
.../distribution/PascalDistributionTest.java | 22 ++---
.../distribution/PoissonDistributionTest.java | 6 +-
.../UniformDiscreteDistributionTest.java | 6 +-
.../distribution/ZipfDistributionTest.java | 8 +-
8 files changed, 116 insertions(+), 116 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 f3fdac8..88c599f 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
@@ -41,12 +41,12 @@ class BinomialDistributionTest extends
DiscreteDistributionAbstractTest {
}
@Override
- public int[] makeDensityTestPoints() {
+ public int[] makeProbabilityTestPoints() {
return new int[] {-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
}
@Override
- public double[] makeDensityTestValues() {
+ public double[] makeProbabilityTestValues() {
// Reference values are from R, version 2.15.3.
return new double[] {0d, 0.0000059049d, 0.000137781d, 0.0014467005,
0.009001692, 0.036756909, 0.1029193452,
0.200120949, 0.266827932,
@@ -55,7 +55,7 @@ class BinomialDistributionTest extends
DiscreteDistributionAbstractTest {
@Override
public int[] makeCumulativeTestPoints() {
- return makeDensityTestPoints();
+ return makeProbabilityTestPoints();
}
@Override
@@ -88,13 +88,13 @@ class BinomialDistributionTest extends
DiscreteDistributionAbstractTest {
0.38278278639999974153, 0.64961071840000017552,
0.84973166740000016794, 0.95265101260000006889,
0.98940792160000001765, 0.99840961360000002323,
0.99985631409999997654, 0.99999409509999992451,
1.00000000000000000000, 1.00000000000000000000});
- setDensityTestValues(new double[] {0.0000000000000000000e+00,
2.8247524899999980341e-02,
+ 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});
setInverseCumulativeTestValues(new int[] {0, 0, 0, 0, 1, 1, 8, 7, 6,
5, 5, 10});
- verifyDensities();
- verifyLogDensities();
+ verifyProbabilities();
+ verifyLogProbabilities();
verifyCumulativeProbabilities();
verifySurvivalProbability();
verifySurvivalAndCumulativeProbabilityComplement();
@@ -108,12 +108,12 @@ class BinomialDistributionTest extends
DiscreteDistributionAbstractTest {
setDistribution(dist);
setCumulativeTestPoints(new int[] {-1, 0, 1, 5, 10});
setCumulativeTestValues(new double[] {0d, 1d, 1d, 1d, 1d});
- setDensityTestPoints(new int[] {-1, 0, 1, 10, 11});
- setDensityTestValues(new double[] {0d, 1d, 0d, 0d, 0d});
+ setProbabilityTestPoints(new int[] {-1, 0, 1, 10, 11});
+ setProbabilityTestValues(new double[] {0d, 1d, 0d, 0d, 0d});
setInverseCumulativeTestPoints(new double[] {0.1d, 0.5d});
setInverseCumulativeTestValues(new int[] {0, 0});
- verifyDensities();
- verifyLogDensities();
+ verifyProbabilities();
+ verifyLogProbabilities();
verifyCumulativeProbabilities();
verifySurvivalProbability();
verifySurvivalAndCumulativeProbabilityComplement();
@@ -129,12 +129,12 @@ class BinomialDistributionTest extends
DiscreteDistributionAbstractTest {
setDistribution(dist);
setCumulativeTestPoints(new int[] {-1, 0, 1, 2, 5, 10});
setCumulativeTestValues(new double[] {0d, 0d, 0d, 0d, 1d, 1d});
- setDensityTestPoints(new int[] {-1, 0, 1, 2, 5, 10});
- setDensityTestValues(new double[] {0d, 0d, 0d, 0d, 1d, 0d});
+ setProbabilityTestPoints(new int[] {-1, 0, 1, 2, 5, 10});
+ setProbabilityTestValues(new double[] {0d, 0d, 0d, 0d, 1d, 0d});
setInverseCumulativeTestPoints(new double[] {0.1d, 0.5d});
setInverseCumulativeTestValues(new int[] {5, 5});
- verifyDensities();
- verifyLogDensities();
+ verifyProbabilities();
+ verifyLogProbabilities();
verifyCumulativeProbabilities();
verifySurvivalProbability();
verifySurvivalAndCumulativeProbabilityComplement();
@@ -150,12 +150,12 @@ class BinomialDistributionTest extends
DiscreteDistributionAbstractTest {
setDistribution(dist);
setCumulativeTestPoints(new int[] {-1, 0, 1, 2, 5, 10});
setCumulativeTestValues(new double[] {0d, 1d, 1d, 1d, 1d, 1d});
- setDensityTestPoints(new int[] {-1, 0, 1, 2, 5, 10});
- setDensityTestValues(new double[] {0d, 1d, 0d, 0d, 0d, 0d});
+ setProbabilityTestPoints(new int[] {-1, 0, 1, 2, 5, 10});
+ setProbabilityTestValues(new double[] {0d, 1d, 0d, 0d, 0d, 0d});
setInverseCumulativeTestPoints(new double[] {0.1d, 0.5d});
setInverseCumulativeTestValues(new int[] {0, 0});
- verifyDensities();
- verifyLogDensities();
+ verifyProbabilities();
+ verifyLogProbabilities();
verifyCumulativeProbabilities();
verifySurvivalProbability();
verifySurvivalAndCumulativeProbabilityComplement();
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 f96c3e2..2363b72 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
@@ -35,8 +35,8 @@ import org.junit.jupiter.api.Test;
* are provided for the makeInverseXxx methods that just invert the mapping
* defined by the arrays returned by the makeCumulativeXxx methods.
* <ul>
- * <li>makeDensityTestPoints() -- arguments used to test probability density
calculation
- * <li>makeDensityTestValues() -- expected probability densities
+ * <li>makeProbabilityTestPoints() -- arguments used to test probability
density calculation
+ * <li>makeProbabilityTestValues() -- expected probability densities
* <li>makeCumulativeTestPoints() -- arguments used to test cumulative
probabilities
* <li>makeCumulativeTestValues() -- expected cumulative probabilities
* <li>makeInverseCumulativeTestPoints() -- arguments used to test inverse
cdf evaluation
@@ -84,14 +84,14 @@ abstract class DiscreteDistributionAbstractTest {
/** Tolerance used in high precision tests. */
private double highPrecisionTolerance = 1e-22;
- /** Arguments used to test probability density calculations. */
- private int[] densityTestPoints;
+ /** Arguments used to test probability calculations. */
+ private int[] probabilityTestPoints;
- /** Values used to test probability density calculations. */
- private double[] densityTestValues;
+ /** Values used to test probability calculations. */
+ private double[] probabilityTestValues;
/** Values used to test logarithmic probability density calculations. */
- private double[] logDensityTestValues;
+ private double[] logProbabilityTestValues;
/** Arguments used to test cumulative probability density calculations. */
private int[] cumulativeTestPoints;
@@ -122,21 +122,21 @@ abstract class DiscreteDistributionAbstractTest {
/** Creates the default discrete distribution instance to use in tests. */
public abstract DiscreteDistribution makeDistribution();
- /** Creates the default probability density test input values. */
- public abstract int[] makeDensityTestPoints();
+ /** Creates the default probability test input values. */
+ public abstract int[] makeProbabilityTestPoints();
- /** Creates the default probability density test expected values. */
- public abstract double[] makeDensityTestValues();
+ /** Creates the default probability test expected values. */
+ public abstract double[] makeProbabilityTestValues();
/** Creates the default logarithmic probability density test expected
values.
*
* <p>The default implementation simply computes the logarithm of all the
values in
- * {@link #makeDensityTestValues()}.
+ * {@link #makeProbabilityTestValues()}.
*
* @return the default logarithmic probability density test expected
values.
*/
- public double[] makeLogDensityTestValues() {
- return Arrays.stream(makeDensityTestValues()).map(Math::log).toArray();
+ public double[] makeLogProbabilityTestValues() {
+ return
Arrays.stream(makeProbabilityTestValues()).map(Math::log).toArray();
}
/** Creates the default cumulative probability test input values. */
@@ -189,9 +189,9 @@ abstract class DiscreteDistributionAbstractTest {
@BeforeEach
void setUp() {
distribution = makeDistribution();
- densityTestPoints = makeDensityTestPoints();
- densityTestValues = makeDensityTestValues();
- logDensityTestValues = makeLogDensityTestValues();
+ probabilityTestPoints = makeProbabilityTestPoints();
+ probabilityTestValues = makeProbabilityTestValues();
+ logProbabilityTestValues = makeLogProbabilityTestValues();
cumulativeTestPoints = makeCumulativeTestPoints();
cumulativeTestValues = makeCumulativeTestValues();
cumulativePrecisionTestPoints = makeCumulativePrecisionTestPoints();
@@ -208,9 +208,9 @@ abstract class DiscreteDistributionAbstractTest {
@AfterEach
void tearDown() {
distribution = null;
- densityTestPoints = null;
- densityTestValues = null;
- logDensityTestValues = null;
+ probabilityTestPoints = null;
+ probabilityTestValues = null;
+ logProbabilityTestValues = null;
cumulativeTestPoints = null;
cumulativeTestValues = null;
cumulativePrecisionTestPoints = null;
@@ -224,26 +224,26 @@ abstract class DiscreteDistributionAbstractTest {
//-------------------- Verification methods -------------------------------
/**
- * Verifies that probability density calculations match expected values
+ * Verifies that probability calculations match expected values
* using current test instance data.
*/
- protected void verifyDensities() {
- for (int i = 0; i < densityTestPoints.length; i++) {
- final int x = densityTestPoints[i];
- Assertions.assertEquals(densityTestValues[i],
+ protected void verifyProbabilities() {
+ for (int i = 0; i < probabilityTestPoints.length; i++) {
+ final int x = probabilityTestPoints[i];
+ Assertions.assertEquals(probabilityTestValues[i],
distribution.probability(x), getTolerance(),
() -> "Incorrect probability value returned for " + x);
}
}
/**
- * Verifies that logarithmic probability density calculations match
expected values
+ * Verifies that logarithmic probability calculations match expected values
* using current test instance data.
*/
- protected void verifyLogDensities() {
- for (int i = 0; i < densityTestPoints.length; i++) {
- final int x = densityTestPoints[i];
- Assertions.assertEquals(logDensityTestValues[i],
+ protected void verifyLogProbabilities() {
+ for (int i = 0; i < probabilityTestPoints.length; i++) {
+ final int x = probabilityTestPoints[i];
+ Assertions.assertEquals(logProbabilityTestValues[i],
distribution.logProbability(x), getTolerance(),
() -> "Incorrect log probability value returned for " + x);
}
@@ -347,13 +347,13 @@ abstract class DiscreteDistributionAbstractTest {
//------------------------ Default test cases -----------------------------
@Test
- void testDensities() {
- verifyDensities();
+ void testProbabilities() {
+ verifyProbabilities();
}
@Test
- void testLogDensities() {
- verifyLogDensities();
+ void testLogProbabilities() {
+ verifyLogProbabilities();
}
@Test
@@ -461,8 +461,8 @@ abstract class DiscreteDistributionAbstractTest {
getDistribution().createSampler(RandomSource.create(RandomSource.WELL_512_A,
1000));
final int[] sample = TestUtils.sample(sampleSize, sampler);
- final int[] densityPoints = makeDensityTestPoints();
- final double[] densityValues = makeDensityTestValues();
+ final int[] densityPoints = makeProbabilityTestPoints();
+ final double[] densityValues = makeProbabilityTestValues();
final int length = TestUtils.eliminateZeroMassPoints(densityPoints,
densityValues);
final double[] expected = Arrays.copyOf(densityValues, length);
@@ -534,49 +534,49 @@ abstract class DiscreteDistributionAbstractTest {
}
/**
- * @return Returns the densityTestPoints.
+ * @return Returns the probabilityTestPoints.
*/
- protected int[] getDensityTestPoints() {
- return densityTestPoints;
+ protected int[] getProbabilityTestPoints() {
+ return probabilityTestPoints;
}
/**
- * @param densityTestPoints The densityTestPoints to set.
+ * @param probabilityTestPoints The probabilityTestPoints to set.
*/
- protected void setDensityTestPoints(int[] densityTestPoints) {
- this.densityTestPoints = densityTestPoints;
+ protected void setProbabilityTestPoints(int[] probabilityTestPoints) {
+ this.probabilityTestPoints = probabilityTestPoints;
}
/**
- * @return Returns the densityTestValues.
+ * @return Returns the probabilityTestValues.
*/
- protected double[] getDensityTestValues() {
- return densityTestValues;
+ protected double[] getProbabilityTestValues() {
+ return probabilityTestValues;
}
/**
* Set the density test values.
* For convenience this recomputes the log density test values using
{@link Math#log(double)}.
*
- * @param densityTestValues The densityTestValues to set.
+ * @param probabilityTestValues The probabilityTestValues to set.
*/
- protected void setDensityTestValues(double[] densityTestValues) {
- this.densityTestValues = densityTestValues;
- logDensityTestValues =
Arrays.stream(densityTestValues).map(Math::log).toArray();
+ protected void setProbabilityTestValues(double[] probabilityTestValues) {
+ this.probabilityTestValues = probabilityTestValues;
+ logProbabilityTestValues =
Arrays.stream(probabilityTestValues).map(Math::log).toArray();
}
/**
- * @return Returns the logDensityTestValues.
+ * @return Returns the logProbabilityTestValues.
*/
- protected double[] getLogDensityTestValues() {
- return logDensityTestValues;
+ protected double[] getLogProbabilityTestValues() {
+ return logProbabilityTestValues;
}
/**
- * @param logDensityTestValues The logDensityTestValues to set.
+ * @param logProbabilityTestValues The logProbabilityTestValues to set.
*/
- protected void setLogDensityTestValues(double[] logDensityTestValues) {
- this.logDensityTestValues = logDensityTestValues;
+ protected void setLogProbabilityTestValues(double[]
logProbabilityTestValues) {
+ this.logProbabilityTestValues = logProbabilityTestValues;
}
/**
diff --git
a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GeometricDistributionTest.java
b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GeometricDistributionTest.java
index 6efdb67..f338d71 100644
---
a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GeometricDistributionTest.java
+++
b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GeometricDistributionTest.java
@@ -41,14 +41,14 @@ class GeometricDistributionTest extends
DiscreteDistributionAbstractTest {
}
@Override
- public int[] makeDensityTestPoints() {
- return new int[] {-1, 0, 1, 2, 3, 4, 5, 6, 7, 8,
+ public int[] makeProbabilityTestPoints() {
+ return new int[] {-1, 0, 1, 2, 3, 4, 5, 6, 7, 8,
9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
19, 20, 21, 22, 23, 24, 25, 26, 27, 28};
}
@Override
- public double[] makeDensityTestValues() {
+ public double[] makeProbabilityTestValues() {
// Reference values are from R, version version 2.15.3.
return new double[] {
0d, 0.4, 0.24, 0.144, 0.0864, 0.05184, 0.031104, 0.0186624,
@@ -62,7 +62,7 @@ class GeometricDistributionTest extends
DiscreteDistributionAbstractTest {
}
@Override
- public double[] makeLogDensityTestValues() {
+ public double[] makeLogProbabilityTestValues() {
// Reference values are from R, version version 2.14.1.
return new double[] {
Double.NEGATIVE_INFINITY, -0.916290731874155, -1.42711635564015,
-1.93794197940614,
@@ -78,12 +78,12 @@ class GeometricDistributionTest extends
DiscreteDistributionAbstractTest {
@Override
public int[] makeCumulativeTestPoints() {
- return makeDensityTestPoints();
+ return makeProbabilityTestPoints();
}
@Override
public double[] makeCumulativeTestValues() {
- final double[] densities = makeDensityTestValues();
+ final double[] densities = makeProbabilityTestValues();
final int n = densities.length;
final double[] ret = new double[n];
ret[0] = densities[0];
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 7dc251c..5717016 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
@@ -45,19 +45,19 @@ class HypergeometricDistributionTest extends
DiscreteDistributionAbstractTest {
}
@Override
- public int[] makeDensityTestPoints() {
+ public int[] makeProbabilityTestPoints() {
return new int[] {-1, 0, 1, 2, 3, 4, 5, 10};
}
@Override
- public double[] makeDensityTestValues() {
+ public double[] makeProbabilityTestValues() {
// Reference values are from R, version 2.15.3.
return new double[] {0d, 0.00396825396825, 0.0992063492063,
0.396825396825, 0.396825396825,
0.0992063492063, 0.00396825396825, 0d};
}
@Override
- public double[] makeLogDensityTestValues() {
+ public double[] makeLogProbabilityTestValues() {
// Reference values are from R, version 2.14.1.
//-Inf -Inf
return new double[] {Double.NEGATIVE_INFINITY, -5.52942908751142,
-2.31055326264322, -0.924258901523332,
@@ -66,7 +66,7 @@ class HypergeometricDistributionTest extends
DiscreteDistributionAbstractTest {
@Override
public int[] makeCumulativeTestPoints() {
- return makeDensityTestPoints();
+ return makeProbabilityTestPoints();
}
@Override
@@ -96,12 +96,12 @@ class HypergeometricDistributionTest extends
DiscreteDistributionAbstractTest {
setDistribution(dist);
setCumulativeTestPoints(new int[] {-1, 0, 1, 3, 10 });
setCumulativeTestValues(new double[] {0d, 0d, 0d, 1d, 1d});
- setDensityTestPoints(new int[] {-1, 0, 1, 3, 10});
- setDensityTestValues(new double[] {0d, 0d, 0d, 1d, 0d});
+ setProbabilityTestPoints(new int[] {-1, 0, 1, 3, 10});
+ setProbabilityTestValues(new double[] {0d, 0d, 0d, 1d, 0d});
setInverseCumulativeTestPoints(new double[] {0.1d, 0.5d});
setInverseCumulativeTestValues(new int[] {3, 3});
- verifyDensities();
- verifyLogDensities();
+ verifyProbabilities();
+ verifyLogProbabilities();
verifyCumulativeProbabilities();
verifySurvivalProbability();
verifySurvivalAndCumulativeProbabilityComplement();
@@ -117,12 +117,12 @@ class HypergeometricDistributionTest extends
DiscreteDistributionAbstractTest {
setDistribution(dist);
setCumulativeTestPoints(new int[] {-1, 0, 1, 3, 10 });
setCumulativeTestValues(new double[] {0d, 1d, 1d, 1d, 1d});
- setDensityTestPoints(new int[] {-1, 0, 1, 3, 10});
- setDensityTestValues(new double[] {0d, 1d, 0d, 0d, 0d});
+ setProbabilityTestPoints(new int[] {-1, 0, 1, 3, 10});
+ setProbabilityTestValues(new double[] {0d, 1d, 0d, 0d, 0d});
setInverseCumulativeTestPoints(new double[] {0.1d, 0.5d});
setInverseCumulativeTestValues(new int[] {0, 0});
- verifyDensities();
- verifyLogDensities();
+ verifyProbabilities();
+ verifyLogProbabilities();
verifyCumulativeProbabilities();
verifySurvivalProbability();
verifySurvivalAndCumulativeProbabilityComplement();
@@ -138,12 +138,12 @@ class HypergeometricDistributionTest extends
DiscreteDistributionAbstractTest {
setDistribution(dist);
setCumulativeTestPoints(new int[] {-1, 0, 1, 3, 10 });
setCumulativeTestValues(new double[] {0d, 0d, 0d, 1d, 1d});
- setDensityTestPoints(new int[] {-1, 0, 1, 3, 10});
- setDensityTestValues(new double[] {0d, 0d, 0d, 1d, 0d});
+ setProbabilityTestPoints(new int[] {-1, 0, 1, 3, 10});
+ setProbabilityTestValues(new double[] {0d, 0d, 0d, 1d, 0d});
setInverseCumulativeTestPoints(new double[] {0.1d, 0.5d});
setInverseCumulativeTestValues(new int[] {3, 3});
- verifyDensities();
- verifyLogDensities();
+ verifyProbabilities();
+ verifyLogProbabilities();
verifyCumulativeProbabilities();
verifySurvivalProbability();
verifySurvivalAndCumulativeProbabilityComplement();
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 6d6467f..00f68a5 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
@@ -44,12 +44,12 @@ class PascalDistributionTest extends
DiscreteDistributionAbstractTest {
}
@Override
- public int[] makeDensityTestPoints() {
+ public int[] makeProbabilityTestPoints() {
return new int[] {-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
}
@Override
- public double[] makeDensityTestValues() {
+ public double[] makeProbabilityTestValues() {
return new double[] {0, 0.0282475249, 0.0847425747, 0.139825248255,
0.167790297906, 0.163595540458,
0.137420253985, 0.103065190489, 0.070673273478,
0.0450542118422, 0.0270325271053,
0.0154085404500, 0.0084046584273};
@@ -57,7 +57,7 @@ class PascalDistributionTest extends
DiscreteDistributionAbstractTest {
@Override
public int[] makeCumulativeTestPoints() {
- return makeDensityTestPoints();
+ return makeProbabilityTestPoints();
}
@Override
@@ -97,12 +97,12 @@ class PascalDistributionTest extends
DiscreteDistributionAbstractTest {
setDistribution(new PascalDistribution(5, 0.0d));
setCumulativeTestPoints(new int[] {-1, 0, 1, 5, 10 });
setCumulativeTestValues(new double[] {0d, 0d, 0d, 0d, 0d});
- setDensityTestPoints(new int[] {-1, 0, 1, 10, 11});
- setDensityTestValues(new double[] {0d, 0d, 0d, 0d, 0d});
+ setProbabilityTestPoints(new int[] {-1, 0, 1, 10, 11});
+ setProbabilityTestValues(new double[] {0d, 0d, 0d, 0d, 0d});
setInverseCumulativeTestPoints(new double[] {0.1d, 0.5d});
setInverseCumulativeTestValues(new int[] {Integer.MAX_VALUE,
Integer.MAX_VALUE});
- verifyDensities();
- verifyLogDensities();
+ verifyProbabilities();
+ verifyLogProbabilities();
verifyCumulativeProbabilities();
verifySurvivalProbability();
verifySurvivalAndCumulativeProbabilityComplement();
@@ -115,12 +115,12 @@ class PascalDistributionTest extends
DiscreteDistributionAbstractTest {
setDistribution(new PascalDistribution(5, 1.0d));
setCumulativeTestPoints(new int[] {-1, 0, 1, 2, 5, 10 });
setCumulativeTestValues(new double[] {0d, 1d, 1d, 1d, 1d, 1d});
- setDensityTestPoints(new int[] {-1, 0, 1, 2, 5, 10});
- setDensityTestValues(new double[] {0d, 1d, 0d, 0d, 0d, 0d});
+ setProbabilityTestPoints(new int[] {-1, 0, 1, 2, 5, 10});
+ setProbabilityTestValues(new double[] {0d, 1d, 0d, 0d, 0d, 0d});
setInverseCumulativeTestPoints(new double[] {0.1d, 0.5d});
setInverseCumulativeTestValues(new int[] {0, 0});
- verifyDensities();
- verifyLogDensities();
+ verifyProbabilities();
+ verifyLogProbabilities();
verifyCumulativeProbabilities();
verifySurvivalProbability();
verifySurvivalAndCumulativeProbabilityComplement();
diff --git
a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PoissonDistributionTest.java
b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PoissonDistributionTest.java
index b908926..dd95696 100644
---
a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PoissonDistributionTest.java
+++
b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PoissonDistributionTest.java
@@ -45,12 +45,12 @@ class PoissonDistributionTest extends
DiscreteDistributionAbstractTest {
}
@Override
- public int[] makeDensityTestPoints() {
+ public int[] makeProbabilityTestPoints() {
return new int[] {-1, 0, 1, 2, 3, 4, 5, 10, 15, 16, 20,
Integer.MAX_VALUE};
}
@Override
- public double[] makeDensityTestValues() {
+ public double[] makeProbabilityTestValues() {
// These and all other test values are generated by R, version 1.8.1
return new double[] {0d, 0.0183156388887d, 0.073262555555d,
0.14652511111d, 0.195366814813d, 0.195366814813d,
@@ -59,7 +59,7 @@ class PoissonDistributionTest extends
DiscreteDistributionAbstractTest {
}
@Override
- public double[] makeLogDensityTestValues() {
+ public double[] makeLogProbabilityTestValues() {
// Reference values are from R, version 2.14.1.
return new double[] {Double.NEGATIVE_INFINITY, -4.000000000000d,
-2.613705638880d, -1.920558458320d,
-1.632876385868d,
diff --git
a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformDiscreteDistributionTest.java
b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformDiscreteDistributionTest.java
index a9a5ab5..0e29262 100644
---
a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformDiscreteDistributionTest.java
+++
b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformDiscreteDistributionTest.java
@@ -43,19 +43,19 @@ class UniformDiscreteDistributionTest extends
DiscreteDistributionAbstractTest {
}
@Override
- public int[] makeDensityTestPoints() {
+ public int[] makeProbabilityTestPoints() {
return new int[] {-4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6};
}
@Override
- public double[] makeDensityTestValues() {
+ public double[] makeProbabilityTestValues() {
final double d = 1.0 / (5 - -3 + 1);
return new double[] {0, d, d, d, d, d, d, d, d, d, 0};
}
@Override
public int[] makeCumulativeTestPoints() {
- return makeDensityTestPoints();
+ return makeProbabilityTestPoints();
}
@Override
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 28f3090..bd3c2db 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
@@ -44,19 +44,19 @@ class ZipfDistributionTest extends
DiscreteDistributionAbstractTest {
}
@Override
- public int[] makeDensityTestPoints() {
+ public int[] makeProbabilityTestPoints() {
return new int[] {-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
}
@Override
- public double[] makeDensityTestValues() {
+ public double[] makeProbabilityTestValues() {
// Reference values are from R, version 2.15.3 (VGAM package 0.9-0).
return new double[] {0d, 0d, 0.341417152147, 0.170708576074,
0.113805717382, 0.0853542880369, 0.0682834304295,
0.0569028586912, 0.0487738788782,
0.0426771440184, 0.0379352391275, 0.0341417152147, 0};
}
@Override
- public double[] makeLogDensityTestValues() {
+ public double[] makeLogProbabilityTestValues() {
// Reference values are from R, version 2.14.1.
return new double[] {Double.NEGATIVE_INFINITY,
Double.NEGATIVE_INFINITY,
-1.07465022926458, -1.76779740982453,
-2.17326251793269, -2.46094459038447,
@@ -66,7 +66,7 @@ class ZipfDistributionTest extends
DiscreteDistributionAbstractTest {
@Override
public int[] makeCumulativeTestPoints() {
- return makeDensityTestPoints();
+ return makeProbabilityTestPoints();
}
@Override
