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 63e69df24ec9e8fc6f11c4bce9e40b952698212a
Author: aherbert <aherb...@apache.org>
AuthorDate: Tue Jul 20 15:42:06 2021 +0100
Remove javadoc from overrides that duplicates the super-class javadoc
---
.../distribution/BinomialDistributionTest.java | 18 ++------------
.../distribution/CauchyDistributionTest.java | 4 ----
.../distribution/ChiSquaredDistributionTest.java | 6 -----
.../ConstantContinuousDistributionTest.java | 5 ----
.../distribution/ExponentialDistributionTest.java | 4 ----
.../statistics/distribution/FDistributionTest.java | 4 ----
.../distribution/GammaDistributionTest.java | 4 ----
.../distribution/GeometricDistributionTest.java | 19 ++-------------
.../HypergeometricDistributionTest.java | 20 +++-------------
.../distribution/LevyDistributionTest.java | 5 +---
.../distribution/LogNormalDistributionTest.java | 12 ----------
.../distribution/NormalDistributionTest.java | 4 ----
.../distribution/ParetoDistributionTest.java | 10 --------
.../distribution/PascalDistributionTest.java | 7 ------
.../distribution/PoissonDistributionTest.java | 28 ++--------------------
.../statistics/distribution/TDistributionTest.java | 4 ----
.../distribution/TriangularDistributionTest.java | 19 ---------------
.../TruncatedNormalDistributionTest.java | 4 ----
.../UniformContinuousDistributionTest.java | 4 ----
.../UniformDiscreteDistributionTest.java | 7 ------
.../distribution/WeibullDistributionTest.java | 4 ----
.../distribution/ZipfDistributionTest.java | 16 ++-----------
22 files changed, 12 insertions(+), 196 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 7653e08..32147d1 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
@@ -35,56 +35,42 @@ class BinomialDistributionTest extends
DiscreteDistributionAbstractTest {
//-------------- Implementations for abstract methods
----------------------
- /** Creates the default discrete distribution instance to use in tests. */
@Override
public DiscreteDistribution makeDistribution() {
return new BinomialDistribution(10, 0.70);
}
- /** Creates the default probability density test input values. */
@Override
public int[] makeDensityTestPoints() {
return new int[] {-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
}
- /**
- * Creates the default probability density test expected values.
- * Reference values are from R, version 2.15.3.
- */
@Override
public double[] makeDensityTestValues() {
+ // 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,
0.2334744405, 0.121060821, 0.0282475249, 0d};
}
- /** Creates the default cumulative probability density test input values.
*/
@Override
public int[] makeCumulativeTestPoints() {
return makeDensityTestPoints();
}
- /**
- * Creates the default cumulative probability density test expected values.
- * Reference values are from R, version 2.15.3.
- */
@Override
public double[] makeCumulativeTestValues() {
+ // Reference values are from R, version 2.15.3.
return new double[] {0d, 5.9049e-06, 0.0001436859, 0.0015903864,
0.0105920784, 0.0473489874,
0.1502683326, 0.3503892816, 0.6172172136,
0.8506916541, 0.9717524751, 1d, 1d};
}
- /** Creates the default inverse cumulative probability test input values.
*/
@Override
public double[] makeInverseCumulativeTestPoints() {
return new double[] {0, 0.001d, 0.010d, 0.025d, 0.050d, 0.100d,
0.999d, 0.990d, 0.975d, 0.950d, 0.900d, 1d};
}
- /**
- * Creates the default inverse cumulative probability density test expected
- * values.
- */
@Override
public int[] makeInverseCumulativeTestValues() {
return new int[] {0, 2, 3, 4, 5, 5, 10, 10, 10, 9, 9, 10};
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 cb332b6..080c90b 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
@@ -39,13 +39,11 @@ class CauchyDistributionTest extends
ContinuousDistributionAbstractTest {
//-------------- Implementations for abstract methods
----------------------
- /** Creates the default continuous distribution instance to use in tests.
*/
@Override
public CauchyDistribution makeDistribution() {
return new CauchyDistribution(1.2, 2.1);
}
- /** Creates the default cumulative probability distribution test input
values. */
@Override
public double[] makeCumulativeTestPoints() {
// quantiles computed using R 2.9.2
@@ -53,14 +51,12 @@ class CauchyDistributionTest extends
ContinuousDistributionAbstractTest {
-5.26313542807, 669.64856187, 68.0230835029,
27.8830299460, 14.4588781808, 7.66313542807};
}
- /** Creates the default cumulative probability density test expected
values. */
@Override
public double[] makeCumulativeTestValues() {
return new double[] {0.001, 0.01, 0.025, 0.05, 0.1, 0.999,
0.990, 0.975, 0.950, 0.900};
}
- /** Creates the default probability density test expected values. */
@Override
public double[] makeDensityTestValues() {
return new double[] {1.49599158008e-06, 0.000149550440335,
0.000933076881878, 0.00370933207799, 0.0144742330437,
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 c6807e5..9d56815 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
@@ -37,13 +37,11 @@ class ChiSquaredDistributionTest extends
ContinuousDistributionAbstractTest {
//-------------- Implementations for abstract methods
----------------------
- /** Creates the default continuous distribution instance to use in tests.
*/
@Override
public ChiSquaredDistribution makeDistribution() {
return new ChiSquaredDistribution(5.0);
}
- /** Creates the default cumulative probability distribution test input
values. */
@Override
public double[] makeCumulativeTestPoints() {
// quantiles computed using R version 2.9.2
@@ -51,20 +49,17 @@ class ChiSquaredDistributionTest extends
ContinuousDistributionAbstractTest {
20.5150056524, 15.0862724694, 12.8325019940,
11.0704976935, 9.23635689978};
}
- /** Creates the default cumulative probability density test expected
values. */
@Override
public double[] makeCumulativeTestValues() {
return new double[] {0.001, 0.01, 0.025, 0.05, 0.1, 0.999, 0.990,
0.975, 0.950, 0.900};
}
- /** Creates the default inverse cumulative probability test input values.
*/
@Override
public double[] makeInverseCumulativeTestPoints() {
return new double[] {0, 0.001d, 0.01d, 0.025d, 0.05d, 0.1d, 0.999d,
0.990d, 0.975d, 0.950d, 0.900d, 1};
}
- /** Creates the default inverse cumulative probability density test
expected values. */
@Override
public double[] makeInverseCumulativeTestValues() {
return new double[] {0, 0.210212602629, 0.554298076728,
0.831211613487, 1.14547622606, 1.61030798696,
@@ -72,7 +67,6 @@ class ChiSquaredDistributionTest extends
ContinuousDistributionAbstractTest {
Double.POSITIVE_INFINITY};
}
- /** Creates the default probability density test expected values. */
@Override
public double[] makeDensityTestValues() {
return new double[] {0.0115379817652, 0.0415948507811,
0.0665060119842, 0.0919455953114, 0.121472591024,
diff --git
a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ConstantContinuousDistributionTest.java
b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ConstantContinuousDistributionTest.java
index 7382c8e..7552c76 100644
---
a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ConstantContinuousDistributionTest.java
+++
b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ConstantContinuousDistributionTest.java
@@ -35,31 +35,26 @@ class ConstantContinuousDistributionTest extends
ContinuousDistributionAbstractT
//-------------- Implementations for abstract methods
----------------------
- /** Creates the default uniform real distribution instance to use in
tests. */
@Override
public ConstantContinuousDistribution makeDistribution() {
return new ConstantContinuousDistribution(1);
}
- /** Creates the default cumulative probability distribution test input
values. */
@Override
public double[] makeCumulativeTestPoints() {
return new double[] {0, 0.5, 1};
}
- /** Creates the default cumulative probability distribution test expected
values. */
@Override
public double[] makeCumulativeTestValues() {
return new double[] {0, 0, 1};
}
- /** Creates the default probability density test expected values. */
@Override
public double[] makeDensityTestValues() {
return new double[] {0, 0, 1};
}
- /** Override default test, verifying that inverse cum is constant. */
@Override
@Test
void testInverseCumulativeProbabilities() {
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 2247ec7..1c7a703 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
@@ -37,13 +37,11 @@ class ExponentialDistributionTest extends
ContinuousDistributionAbstractTest {
//-------------- Implementations for abstract methods
----------------------
- /** Creates the default continuous distribution instance to use in tests.
*/
@Override
public ExponentialDistribution makeDistribution() {
return new ExponentialDistribution(5.0);
}
- /** Creates the default cumulative probability distribution test input
values. */
@Override
public double[] makeCumulativeTestPoints() {
// quantiles computed using R version 2.9.2
@@ -51,14 +49,12 @@ class ExponentialDistributionTest extends
ContinuousDistributionAbstractTest {
0.526802578289, 34.5387763949, 23.0258509299,
18.4443972706, 14.9786613678, 11.5129254650};
}
- /** Creates the default cumulative probability density test expected
values. */
@Override
public double[] makeCumulativeTestValues() {
return new double[] {0.001, 0.01, 0.025, 0.05, 0.1, 0.999,
0.990, 0.975, 0.950, 0.900};
}
- /** Creates the default probability density test expected values. */
@Override
public double[] makeDensityTestValues() {
return new double[] {0.1998, 0.198, 0.195, 0.19, 0.18,
0.000200000000000,
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 ca93848..38b38f1 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
@@ -36,13 +36,11 @@ class FDistributionTest extends
ContinuousDistributionAbstractTest {
//-------------- Implementations for abstract methods
----------------------
- /** Creates the default continuous distribution instance to use in tests.
*/
@Override
public FDistribution makeDistribution() {
return new FDistribution(5.0, 6.0);
}
- /** Creates the default cumulative probability distribution test input
values. */
@Override
public double[] makeCumulativeTestPoints() {
// quantiles computed using R version 2.9.2
@@ -50,13 +48,11 @@ class FDistributionTest extends
ContinuousDistributionAbstractTest {
20.8026639595, 8.74589525602, 5.98756512605,
4.38737418741, 3.10751166664};
}
- /** Creates the default cumulative probability density test expected
values. */
@Override
public double[] makeCumulativeTestValues() {
return new double[] {0.001, 0.01, 0.025, 0.05, 0.1, 0.999, 0.990,
0.975, 0.950, 0.900};
}
- /** Creates the default probability density test expected values. */
@Override
public double[] makeDensityTestValues() {
return new double[] {0.0689156576706, 0.236735653193, 0.364074131941,
0.481570789649, 0.595880479994,
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 fe6aa31..b7eb220 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
@@ -46,13 +46,11 @@ class GammaDistributionTest extends
ContinuousDistributionAbstractTest {
//-------------- Implementations for abstract methods
----------------------
- /** Creates the default continuous distribution instance to use in tests.
*/
@Override
public GammaDistribution makeDistribution() {
return new GammaDistribution(4d, 2d);
}
- /** Creates the default cumulative probability distribution test input
values. */
@Override
public double[] makeCumulativeTestPoints() {
// quantiles computed using R version 2.9.2
@@ -60,13 +58,11 @@ class GammaDistributionTest extends
ContinuousDistributionAbstractTest {
26.1244815584, 20.0902350297, 17.5345461395,
15.5073130559, 13.3615661365};
}
- /** Creates the default cumulative probability density test expected
values. */
@Override
public double[] makeCumulativeTestValues() {
return new double[] {0.001, 0.01, 0.025, 0.05, 0.1, 0.999, 0.990,
0.975, 0.950, 0.900};
}
- /** Creates the default probability density test expected values. */
@Override
public double[] makeDensityTestValues() {
return new double[] {0.00427280075546, 0.0204117166709,
0.0362756163658, 0.0542113174239, 0.0773195272491,
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 d5c37bb..45dc8d5 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
@@ -35,13 +35,11 @@ class GeometricDistributionTest extends
DiscreteDistributionAbstractTest {
//-------------- Implementations for abstract methods
----------------------
- /** Creates the default discrete distribution instance to use in tests. */
@Override
public DiscreteDistribution makeDistribution() {
return new GeometricDistribution(0.40);
}
- /** Creates the default probability density test input values. */
@Override
public int[] makeDensityTestPoints() {
return new int[] {-1, 0, 1, 2, 3, 4, 5, 6, 7, 8,
@@ -49,12 +47,9 @@ class GeometricDistributionTest extends
DiscreteDistributionAbstractTest {
19, 20, 21, 22, 23, 24, 25, 26, 27, 28};
}
- /**
- * Creates the default probability density test expected values.
- * Reference values are from R, version version 2.15.3.
- */
@Override
public double[] makeDensityTestValues() {
+ // 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,
0.01119744, 0.006718464, 0.0040310784, 0.00241864704,
@@ -66,12 +61,9 @@ class GeometricDistributionTest extends
DiscreteDistributionAbstractTest {
};
}
- /**
- * Creates the default log probability density test expected values.
- * Reference values are from R, version version 2.14.1.
- */
@Override
public double[] makeLogDensityTestValues() {
+ // Reference values are from R, version version 2.14.1.
return new double[] {
Double.NEGATIVE_INFINITY, -0.916290731874155, -1.42711635564015,
-1.93794197940614,
-2.44876760317213, -2.95959322693812, -3.47041885070411,
-3.9812444744701,
@@ -84,13 +76,11 @@ class GeometricDistributionTest extends
DiscreteDistributionAbstractTest {
};
}
- /** Creates the default cumulative probability density test input values.
*/
@Override
public int[] makeCumulativeTestPoints() {
return makeDensityTestPoints();
}
- /** Creates the default cumulative probability density test expected
values. */
@Override
public double[] makeCumulativeTestValues() {
final double[] densities = makeDensityTestValues();
@@ -103,7 +93,6 @@ class GeometricDistributionTest extends
DiscreteDistributionAbstractTest {
return ret;
}
- /** Creates the default inverse cumulative probability test input values.
*/
@Override
public double[] makeInverseCumulativeTestPoints() {
return new double[] {
@@ -133,10 +122,6 @@ class GeometricDistributionTest extends
DiscreteDistributionAbstractTest {
};
}
- /**
- * Creates the default inverse cumulative probability density test expected
- * values.
- */
@Override
public int[] makeInverseCumulativeTestValues() {
return new int[] {
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 3985fb6..19f692f 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
@@ -39,63 +39,49 @@ class HypergeometricDistributionTest extends
DiscreteDistributionAbstractTest {
//-------------- Implementations for abstract methods
----------------------
- /** Creates the default discrete distribution instance to use in tests. */
@Override
public DiscreteDistribution makeDistribution() {
return new HypergeometricDistribution(10, 5, 5);
}
- /** Creates the default probability density test input values. */
@Override
public int[] makeDensityTestPoints() {
return new int[] {-1, 0, 1, 2, 3, 4, 5, 10};
}
- /**
- * Creates the default probability density test expected values.
- * Reference values are from R, version 2.15.3.
- */
@Override
public double[] makeDensityTestValues() {
+ // 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};
}
- /**
- * Creates the default probability log density test expected values.
- * Reference values are from R, version 2.14.1.
- */
@Override
public double[] makeLogDensityTestValues() {
+ // Reference values are from R, version 2.14.1.
//-Inf -Inf
return new double[] {Double.NEGATIVE_INFINITY, -5.52942908751142,
-2.31055326264322, -0.924258901523332,
-0.924258901523332, -2.31055326264322,
-5.52942908751142, Double.NEGATIVE_INFINITY};
}
- /** Creates the default cumulative probability density test input values.
*/
@Override
public int[] makeCumulativeTestPoints() {
return makeDensityTestPoints();
}
- /**
- * Creates the default cumulative probability density test expected values.
- * Reference values are from R, version 2.15.3.
- */
@Override
public double[] makeCumulativeTestValues() {
+ // Reference values are from R, version 2.15.3.
return new double[] {0d, 0.00396825396825, 0.103174603175, .5,
0.896825396825, 0.996031746032,
1, 1};
}
- /** Creates the default inverse cumulative probability test input values.
*/
@Override
public double[] makeInverseCumulativeTestPoints() {
return new double[] {0d, 0.001d, 0.010d, 0.025d, 0.050d, 0.100d,
0.999d,
0.990d, 0.975d, 0.950d, 0.900d, 1d};
}
- /** Creates the default inverse cumulative probability density test
expected values. */
@Override
public int[] makeInverseCumulativeTestValues() {
return new int[] {0, 0, 1, 1, 1, 1, 5, 4, 4, 4, 4, 5};
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 558a3d7..01cedcb 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
@@ -53,12 +53,9 @@ class LevyDistributionTest extends
ContinuousDistributionAbstractTest {
};
}
- /**
- * Creates the default logarithmic probability density test expected
values.
- * Reference values are from R, version 2.14.1.
- */
@Override
public double[] makeLogDensityTestValues() {
+ // Reference values are from R, version 2.14.1.
return new double[] {
-1987.561573341398d, -14.469328620160d, -3.843764717971d,
-0.883485488811d, 0.076793740349d, -1.127785768948d,
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 1a06c7c..3a4e7fd 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
@@ -37,13 +37,11 @@ class LogNormalDistributionTest extends
ContinuousDistributionAbstractTest {
//-------------- Implementations for abstract methods
----------------------
- /** Creates the default real distribution instance to use in tests. */
@Override
public LogNormalDistribution makeDistribution() {
return new LogNormalDistribution(2.1, 1.4);
}
- /** Creates the default cumulative probability distribution test input
values. */
@Override
public double[] makeCumulativeTestPoints() {
// quantiles computed using R
@@ -54,7 +52,6 @@ class LogNormalDistributionTest extends
ContinuousDistributionAbstractTest {
4.40279507773206, 3.89417219176244};
}
- /** Creates the default cumulative probability density test expected
values. */
@Override
public double[] makeCumulativeTestValues() {
return new double[] {0, 0, 0, 0, 0.00948199951485, 0.432056525076,
@@ -62,7 +59,6 @@ class LogNormalDistributionTest extends
ContinuousDistributionAbstractTest {
0.298422824228};
}
- /** Creates the default probability density test expected values. */
@Override
public double[] makeDensityTestValues() {
return new double[] {0, 0, 0, 0, 0.0594218160072, 0.0436977691036,
@@ -70,10 +66,6 @@ class LogNormalDistributionTest extends
ContinuousDistributionAbstractTest {
0.0636229042785};
}
- /**
- * Creates the default inverse cumulative probability distribution test
- * input values.
- */
@Override
public double[] makeInverseCumulativeTestPoints() {
// Exclude the test points less than zero, as they have cumulative
@@ -86,10 +78,6 @@ class LogNormalDistributionTest extends
ContinuousDistributionAbstractTest {
//return Arrays.copyOfRange(points, 4, points.length - 4);
}
- /**
- * Creates the default inverse cumulative probability test expected
- * values.
- */
@Override
public double[] makeInverseCumulativeTestValues() {
// Exclude the test points less than zero, as they have cumulative
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 7cdd0b4..8d5747d 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
@@ -39,13 +39,11 @@ class NormalDistributionTest extends
ContinuousDistributionAbstractTest {
//-------------- Implementations for abstract methods
----------------------
- /** Creates the default real distribution instance to use in tests. */
@Override
public NormalDistribution makeDistribution() {
return new NormalDistribution(2.1, 1.4);
}
- /** Creates the default cumulative probability distribution test input
values. */
@Override
public double[] makeCumulativeTestPoints() {
// quantiles computed using R
@@ -53,14 +51,12 @@ class NormalDistributionTest extends
ContinuousDistributionAbstractTest {
6.42632522863494d, 5.35688702365718d,
4.843949578356074d, 4.40279507773206d, 3.89417219176244d};
}
- /** Creates the default cumulative probability density test expected
values. */
@Override
public double[] makeCumulativeTestValues() {
return new double[] {0.001d, 0.01d, 0.025d, 0.05d, 0.1d, 0.999d,
0.990d, 0.975d, 0.950d, 0.900d};
}
- /** Creates the default probability density test expected values. */
@Override
public double[] makeDensityTestValues() {
return new double[] {0.00240506434076, 0.0190372444310,
0.0417464784322, 0.0736683145538, 0.125355951380,
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 64844ed..93a9316 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
@@ -36,13 +36,11 @@ class ParetoDistributionTest extends
ContinuousDistributionAbstractTest {
//-------------- Implementations for abstract methods
----------------------
- /** Creates the default real distribution instance to use in tests. */
@Override
public ParetoDistribution makeDistribution() {
return new ParetoDistribution(2.1, 1.4);
}
- /** Creates the default cumulative probability distribution test input
values. */
@Override
public double[] makeCumulativeTestPoints() {
// quantiles computed using R
@@ -50,21 +48,16 @@ class ParetoDistributionTest extends
ContinuousDistributionAbstractTest {
+6.42632522863494, 5.35688702365718,
4.843949578356074, 4.40279507773206, 3.89417219176244};
}
- /** Creates the default cumulative probability density test expected
values. */
@Override
public double[] makeCumulativeTestValues() {
return new double[] {0, 0, 0, 0, 0, 0.791089998892, 0.730456085931,
0.689667290488, 0.645278794701, 0.578763688757};
}
- /** Creates the default probability density test expected values. */
@Override
public double[] makeDensityTestValues() {
return new double[] {0, 0, 0, 0, 0, 0.0455118580441, 0.070444173646,
0.0896924681582, 0.112794186114, 0.151439332084};
}
- /**
- * Creates the default inverse cumulative probability distribution test
input values.
- */
@Override
public double[] makeInverseCumulativeTestPoints() {
// Exclude the test points less than zero, as they have cumulative
@@ -76,9 +69,6 @@ class ParetoDistributionTest extends
ContinuousDistributionAbstractTest {
return points2;
}
- /**
- * Creates the default inverse cumulative probability test expected values.
- */
@Override
public double[] makeInverseCumulativeTestValues() {
// Exclude the test points less than zero, as they have cumulative
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 207dd20..66ecfe6 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
@@ -38,19 +38,16 @@ class PascalDistributionTest extends
DiscreteDistributionAbstractTest {
//-------------- Implementations for abstract methods
----------------------
- /** Creates the default discrete distribution instance to use in tests. */
@Override
public PascalDistribution makeDistribution() {
return new PascalDistribution(10, 0.70);
}
- /** Creates the default probability density test input values. */
@Override
public int[] makeDensityTestPoints() {
return new int[] {-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
}
- /** Creates the default probability density test expected values. */
@Override
public double[] makeDensityTestValues() {
return new double[] {0, 0.0282475249, 0.0847425747, 0.139825248255,
0.167790297906, 0.163595540458,
@@ -58,13 +55,11 @@ class PascalDistributionTest extends
DiscreteDistributionAbstractTest {
0.0154085404500, 0.0084046584273};
}
- /** Creates the default cumulative probability density test input values.
*/
@Override
public int[] makeCumulativeTestPoints() {
return makeDensityTestPoints();
}
- /** Creates the default cumulative probability density test expected
values. */
@Override
public double[] makeCumulativeTestValues() {
return new double[] {0, 0.0282475249, 0.1129900996, 0.252815347855,
0.420605645761, 0.584201186219,
@@ -72,14 +67,12 @@ class PascalDistributionTest extends
DiscreteDistributionAbstractTest {
0.982855183569, 0.991259841996};
}
- /** Creates the default inverse cumulative probability test input values.
*/
@Override
public double[] makeInverseCumulativeTestPoints() {
return new double[] {0.0, 0.001, 0.010, 0.025, 0.050, 0.100, 0.999,
0.990, 0.975, 0.950, 0.900, 1.0};
}
- /** Creates the default inverse cumulative probability density test
expected values. */
@Override
public int[] makeInverseCumulativeTestValues() {
return new int[] {0, 0, 0, 0, 1, 1, 14, 11, 10, 9, 8,
Integer.MAX_VALUE};
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 8a71a8a..f30f697 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
@@ -39,40 +39,28 @@ class PoissonDistributionTest extends
DiscreteDistributionAbstractTest {
//-------------- Implementations for abstract methods
----------------------
- /**
- * Creates the default discrete distribution instance to use in tests.
- */
@Override
public DiscreteDistribution makeDistribution() {
return new PoissonDistribution(DEFAULT_TEST_POISSON_PARAMETER);
}
- /**
- * Creates the default probability density test input values.
- */
@Override
public int[] makeDensityTestPoints() {
return new int[] {-1, 0, 1, 2, 3, 4, 5, 10, 15, 16, 20,
Integer.MAX_VALUE};
}
- /**
- * Creates the default probability density test expected values.
- * These and all other test values are generated by R, version 1.8.1
- */
@Override
public double[] makeDensityTestValues() {
+ // 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,
0.156293451851d, 0.00529247667642d,
1.503911676283e-05d,
3.759779190708e-06d, 8.27746364655e-09, 0d};
}
- /**
- * Creates the default logarithmic probability density test expected
values.
- * Reference values are from R, version 2.14.1.
- */
@Override
public double[] makeLogDensityTestValues() {
+ // Reference values are from R, version 2.14.1.
return new double[] {Double.NEGATIVE_INFINITY, -4.000000000000d,
-2.613705638880d, -1.920558458320d,
-1.632876385868d,
-1.632876385868d, -1.856019937183d,
-5.241468961877d,
@@ -80,17 +68,11 @@ class PoissonDistributionTest extends
DiscreteDistributionAbstractTest {
Double.NEGATIVE_INFINITY};
}
- /**
- * Creates the default cumulative probability density test input values.
- */
@Override
public int[] makeCumulativeTestPoints() {
return new int[] {-1, 0, 1, 2, 3, 4, 5, 10, 20, Integer.MAX_VALUE};
}
- /**
- * Creates the default cumulative probability density test expected values.
- */
@Override
public double[] makeCumulativeTestValues() {
return new double[] {0d, 0.0183156388887d, 0.0915781944437d,
@@ -98,9 +80,6 @@ class PoissonDistributionTest extends
DiscreteDistributionAbstractTest {
0.78513038703d, 0.99716023388d, 0.999999998077,
1.0};
}
- /**
- * Creates the default inverse cumulative probability test input values.
- */
@Override
public double[] makeInverseCumulativeTestPoints() {
final DiscreteDistribution dist = getDistribution();
@@ -111,9 +90,6 @@ class PoissonDistributionTest extends
DiscreteDistributionAbstractTest {
dist.cumulativeProbability(10),
dist.cumulativeProbability(20)};
}
- /**
- * Creates the default inverse cumulative probability density test
expected values.
- */
@Override
public int[] makeInverseCumulativeTestValues() {
return new int[] {0, 0, 1, 1, 2, 2, 3, 3, 4, 5, 10, 20};
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 424e871..2d0b457 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
@@ -35,13 +35,11 @@ class TDistributionTest extends
ContinuousDistributionAbstractTest {
//-------------- Implementations for abstract methods
----------------------
- /** Creates the default continuous distribution instance to use in tests.
*/
@Override
public TDistribution makeDistribution() {
return new TDistribution(5.0);
}
- /** Creates the default cumulative probability distribution test input
values. */
@Override
public double[] makeCumulativeTestPoints() {
// quantiles computed using R version 2.9.2
@@ -49,14 +47,12 @@ class TDistributionTest extends
ContinuousDistributionAbstractTest {
5.89342953136, 3.36492999891, 2.57058183564,
2.01504837333, 1.47588404882};
}
- /** Creates the default cumulative probability density test expected
values. */
@Override
public double[] makeCumulativeTestValues() {
return new double[] {0.001, 0.01, 0.025, 0.05, 0.1, 0.999,
0.990, 0.975, 0.950, 0.900};
}
- /** Creates the default probability density test expected values. */
@Override
public double[] makeDensityTestValues() {
return new double[] {0.000756494565517, 0.0109109752919,
0.0303377878006, 0.0637967988952, 0.128289492005,
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 f7c9db0..09a5ac2 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
@@ -36,19 +36,12 @@ class TriangularDistributionTest extends
ContinuousDistributionAbstractTest {
//-------------- Implementations for abstract methods
----------------------
- /**
- * Creates the default triangular distribution instance to use in tests.
- */
@Override
public TriangularDistribution makeDistribution() {
// Left side 5 wide, right side 10 wide.
return new TriangularDistribution(-3, 2, 12);
}
- /**
- * Creates the default cumulative probability distribution test input
- * values.
- */
@Override
public double[] makeCumulativeTestPoints() {
return new double[] {
@@ -62,9 +55,6 @@ class TriangularDistributionTest extends
ContinuousDistributionAbstractTest {
};
}
- /**
- * Creates the default cumulative probability density test expected values.
- */
@Override
public double[] makeCumulativeTestValues() {
// Top at 2 / (b - a) = 2 / (12 - -3) = 2 / 15 = 7.5
@@ -86,10 +76,6 @@ class TriangularDistributionTest extends
ContinuousDistributionAbstractTest {
1.0};
}
- /**
- * Creates the default inverse cumulative probability distribution test
- * input values.
- */
@Override
public double[] makeInverseCumulativeTestPoints() {
// Exclude the points outside the limits, as they have cumulative
@@ -102,10 +88,6 @@ class TriangularDistributionTest extends
ContinuousDistributionAbstractTest {
//return Arrays.copyOfRange(points, 1, points.length - 1);
}
- /**
- * Creates the default inverse cumulative probability density test expected
- * values.
- */
@Override
public double[] makeInverseCumulativeTestValues() {
// Exclude the points outside the limits, as they have cumulative
@@ -118,7 +100,6 @@ class TriangularDistributionTest extends
ContinuousDistributionAbstractTest {
//return Arrays.copyOfRange(points, 1, points.length - 1);
}
- /** Creates the default probability density test expected values. */
@Override
public double[] makeDensityTestValues() {
return new double[] {0,
diff --git
a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TruncatedNormalDistributionTest.java
b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TruncatedNormalDistributionTest.java
index 0d1b974..7966a17 100644
---
a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TruncatedNormalDistributionTest.java
+++
b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TruncatedNormalDistributionTest.java
@@ -37,13 +37,11 @@ class TruncatedNormalDistributionTest extends
ContinuousDistributionAbstractTest
//-------------- Implementations for abstract methods
----------------------
- /** {@inheritDoc} */
@Override
public ContinuousDistribution makeDistribution() {
return new TruncatedNormalDistribution(1.9, 1.3, -1.1, 3.4);
}
- /** {@inheritDoc} */
@Override
public double[] makeCumulativeTestPoints() {
return new double[]{-1.1, -1.09597275767544, -1.0609616183922,
-0.79283350106842,
@@ -53,14 +51,12 @@ class TruncatedNormalDistributionTest extends
ContinuousDistributionAbstractTest
3.39945153287941, 3.4};
}
- /** {@inheritDoc} */
@Override
public double[] makeCumulativeTestValues() {
return new double[]{0, 0.0001, 0.001, 0.01, 0.025, 0.05, 0.1, 0.25,
0.5, 0.75, 0.9, 0.95,
0.975, 0.99, 0.999, 0.9999, 1};
}
- /** {@inheritDoc} */
@Override
public double[] makeDensityTestValues() {
return new double[]{0.0247422752302618, 0.0249196707321102,
0.0265057408263321,
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 2e5f657..b2fe83e 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
@@ -36,20 +36,17 @@ class UniformContinuousDistributionTest extends
ContinuousDistributionAbstractTe
//-------------- Implementations for abstract methods
----------------------
- /** Creates the default uniform real distribution instance to use in
tests. */
@Override
public UniformContinuousDistribution makeDistribution() {
return new UniformContinuousDistribution(-0.5, 1.25);
}
- /** Creates the default cumulative probability distribution test input
values. */
@Override
public double[] makeCumulativeTestPoints() {
return new double[] {-0.5001, -0.5, -0.4999, -0.25, -0.0001, 0.0,
0.0001, 0.25, 1.0, 1.2499, 1.25, 1.2501};
}
- /** Creates the default cumulative probability density test expected
values. */
@Override
public double[] makeCumulativeTestValues() {
return new double[] {0.0, 0.0, 0.0001, 0.25 / 1.75, 0.4999 / 1.75,
@@ -57,7 +54,6 @@ class UniformContinuousDistributionTest extends
ContinuousDistributionAbstractTe
1.7499 / 1.75, 1.0, 1.0};
}
- /** Creates the default probability density test expected values. */
@Override
public double[] makeDensityTestValues() {
final double d = 1 / 1.75;
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 6370221..a9a5ab5 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
@@ -37,46 +37,39 @@ class UniformDiscreteDistributionTest extends
DiscreteDistributionAbstractTest {
//-------------- Implementations for abstract methods
----------------------
- /** Creates the default discrete distribution instance to use in tests. */
@Override
public DiscreteDistribution makeDistribution() {
return new UniformDiscreteDistribution(-3, 5);
}
- /** Creates the default probability density test input values. */
@Override
public int[] makeDensityTestPoints() {
return new int[] {-4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6};
}
- /** Creates the default probability density test expected values. */
@Override
public double[] makeDensityTestValues() {
final double d = 1.0 / (5 - -3 + 1);
return new double[] {0, d, d, d, d, d, d, d, d, d, 0};
}
- /** Creates the default cumulative probability density test input values.
*/
@Override
public int[] makeCumulativeTestPoints() {
return makeDensityTestPoints();
}
- /** Creates the default cumulative probability density test expected
values. */
@Override
public double[] makeCumulativeTestValues() {
return new double[] {0, 1 / 9.0, 2 / 9.0, 3 / 9.0, 4 / 9.0, 5 / 9.0,
6 / 9.0, 7 / 9.0, 8 / 9.0, 1, 1};
}
- /** Creates the default inverse cumulative probability test input values.
*/
@Override
public double[] makeInverseCumulativeTestPoints() {
return new double[] {0, 0.001, 0.010, 0.025, 0.050, 0.100, 0.200,
0.5, 0.999, 0.990, 0.975, 0.950, 0.900, 1};
}
- /** Creates the default inverse cumulative probability density test
expected values. */
@Override
public int[] makeInverseCumulativeTestValues() {
return new int[] {-3, -3, -3, -3, -3, -3, -2, 1, 5, 5, 5, 5, 5, 5};
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 347a10d..aa076ba 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
@@ -36,13 +36,11 @@ class WeibullDistributionTest extends
ContinuousDistributionAbstractTest {
//-------------- Implementations for abstract methods
----------------------
- /** Creates the default continuous distribution instance to use in tests.
*/
@Override
public WeibullDistribution makeDistribution() {
return new WeibullDistribution(1.2, 2.1);
}
- /** Creates the default cumulative probability distribution test input
values. */
@Override
public double[] makeCumulativeTestPoints() {
// quantiles computed using R version 2.9.2
@@ -50,13 +48,11 @@ class WeibullDistributionTest extends
ContinuousDistributionAbstractTest {
10.5115496887, 7.4976304671, 6.23205600701,
5.23968436955, 4.2079028257};
}
- /** Creates the default cumulative probability density test expected
values. */
@Override
public double[] makeCumulativeTestValues() {
return new double[] {0.001, 0.01, 0.025, 0.05, 0.1, 0.999, 0.990,
0.975, 0.950, 0.900};
}
- /** Creates the default probability density test expected values. */
@Override
public double[] makeDensityTestValues() {
return new double[] {0.180535929306, 0.262801138133, 0.301905425199,
0.330899152971,
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 19e8d05..46af645 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
@@ -38,61 +38,49 @@ class ZipfDistributionTest extends
DiscreteDistributionAbstractTest {
//-------------- Implementations for abstract methods
----------------------
- /** Creates the default discrete distribution instance to use in tests. */
@Override
public ZipfDistribution makeDistribution() {
return new ZipfDistribution(10, 1);
}
- /** Creates the default probability density test input values. */
@Override
public int[] makeDensityTestPoints() {
return new int[] {-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
}
- /**
- * Creates the default probability density test expected values.
- * Reference values are from R, version 2.15.3 (VGAM package 0.9-0).
- */
@Override
public double[] makeDensityTestValues() {
+ // 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};
}
- /**
- * Creates the default logarithmic probability density test expected
values.
- * Reference values are from R, version 2.14.1.
- */
@Override
public double[] makeLogDensityTestValues() {
+ // 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,
-2.68408814169868, -2.86640969849264,
-3.0205603783199, -3.15409177094442,
-3.2718748066008, -3.37723532225863,
Double.NEGATIVE_INFINITY};
}
- /** Creates the default cumulative probability density test input values.
*/
@Override
public int[] makeCumulativeTestPoints() {
return makeDensityTestPoints();
}
- /** Creates the default cumulative probability density test expected
values. */
@Override
public double[] makeCumulativeTestValues() {
return new double[] {0, 0, 0.341417152147, 0.512125728221,
0.625931445604, 0.71128573364,
0.77956916407, 0.836472022761, 0.885245901639,
0.927923045658, 0.965858284785, 1d, 1d};
}
- /** Creates the default inverse cumulative probability test input values.
*/
@Override
public double[] makeInverseCumulativeTestPoints() {
return new double[] {0d, 0.001d, 0.010d, 0.025d, 0.050d, 0.3413d,
0.3415d, 0.999d,
0.990d, 0.975d, 0.950d, 0.900d, 1d};
}
- /** Creates the default inverse cumulative probability density test
expected values. */
@Override
public int[] makeInverseCumulativeTestValues() {
return new int[] {1, 1, 1, 1, 1, 1, 2, 10, 10, 10, 9, 8, 10};
