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 2019/05/20 13:35:15 UTC
[commons-statistics] 02/02: Swap expected and observed arguments
for Assert.
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 c5f40f30b17c610358d33af0274b47b182b96ee1
Author: aherbert <ah...@apache.org>
AuthorDate: Mon May 20 14:35:08 2019 +0100
Swap expected and observed arguments for Assert.
---
.../distribution/BetaDistributionTest.java | 8 ++++----
.../distribution/BinomialDistributionTest.java | 8 ++++----
.../distribution/ChiSquaredDistributionTest.java | 8 ++++----
.../ConstantContinuousDistributionTest.java | 4 ++--
.../distribution/ExponentialDistributionTest.java | 8 ++++----
.../statistics/distribution/FDistributionTest.java | 6 +++---
.../distribution/GammaDistributionTest.java | 8 ++++----
.../distribution/GeometricDistributionTest.java | 8 ++++----
.../HypergeometricDistributionTest.java | 20 ++++++++++----------
.../distribution/LogNormalDistributionTest.java | 22 ++++++++++------------
.../distribution/NormalDistributionTest.java | 20 ++++++++++----------
.../distribution/ParetoDistributionTest.java | 16 ++++++++--------
.../distribution/PascalDistributionTest.java | 8 ++++----
.../distribution/PoissonDistributionTest.java | 8 ++++----
.../statistics/distribution/TDistributionTest.java | 6 +++---
.../distribution/TriangularDistributionTest.java | 12 ++++++------
.../UniformContinuousDistributionTest.java | 12 ++++++------
.../UniformDiscreteDistributionTest.java | 8 ++++----
.../distribution/WeibullDistributionTest.java | 14 +++++++-------
.../distribution/ZipfDistributionTest.java | 9 ++++-----
20 files changed, 105 insertions(+), 108 deletions(-)
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BetaDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BetaDistributionTest.java
index c4ce76e..7edd163 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BetaDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BetaDistributionTest.java
@@ -304,12 +304,12 @@ public class BetaDistributionTest {
BetaDistribution dist;
dist = new BetaDistribution(1, 1);
- Assert.assertEquals(dist.getMean(), 0.5, tol);
- Assert.assertEquals(dist.getVariance(), 1.0 / 12.0, tol);
+ Assert.assertEquals(0.5, dist.getMean(), tol);
+ Assert.assertEquals(1.0 / 12.0, dist.getVariance(), tol);
dist = new BetaDistribution(2, 5);
- Assert.assertEquals(dist.getMean(), 2.0 / 7.0, tol);
- Assert.assertEquals(dist.getVariance(), 10.0 / (49.0 * 8.0), tol);
+ Assert.assertEquals(2.0 / 7.0, dist.getMean(), tol);
+ Assert.assertEquals(10.0 / (49.0 * 8.0), dist.getVariance(), tol);
}
@Test
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 1e8c2e5..b8c54b2 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
@@ -153,12 +153,12 @@ public class BinomialDistributionTest extends DiscreteDistributionAbstractTest {
BinomialDistribution dist;
dist = new BinomialDistribution(10, 0.5);
- Assert.assertEquals(dist.getMean(), 10d * 0.5d, tol);
- Assert.assertEquals(dist.getVariance(), 10d * 0.5d * 0.5d, tol);
+ Assert.assertEquals(10d * 0.5d, dist.getMean(), tol);
+ Assert.assertEquals(10d * 0.5d * 0.5d, dist.getVariance(), tol);
dist = new BinomialDistribution(30, 0.3);
- Assert.assertEquals(dist.getMean(), 30d * 0.3d, tol);
- Assert.assertEquals(dist.getVariance(), 30d * 0.3d * (1d - 0.3d), tol);
+ Assert.assertEquals(30d * 0.3d, dist.getMean(), tol);
+ Assert.assertEquals(30d * 0.3d * (1d - 0.3d), dist.getVariance(), tol);
}
@Test
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ChiSquaredDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ChiSquaredDistributionTest.java
index 0043062..17b35dc 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
@@ -126,11 +126,11 @@ public class ChiSquaredDistributionTest extends ContinuousDistributionAbstractTe
ChiSquaredDistribution dist;
dist = new ChiSquaredDistribution(1500);
- Assert.assertEquals(dist.getMean(), 1500, tol);
- Assert.assertEquals(dist.getVariance(), 3000, tol);
+ Assert.assertEquals(1500, dist.getMean(), tol);
+ Assert.assertEquals(3000, dist.getVariance(), tol);
dist = new ChiSquaredDistribution(1.12);
- Assert.assertEquals(dist.getMean(), 1.12, tol);
- Assert.assertEquals(dist.getVariance(), 2.24, tol);
+ Assert.assertEquals(1.12, dist.getMean(), tol);
+ Assert.assertEquals(2.24, dist.getVariance(), tol);
}
}
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 586485a..1db6096 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
@@ -76,8 +76,8 @@ public class ConstantContinuousDistributionTest extends ContinuousDistributionAb
ConstantContinuousDistribution dist;
dist = new ConstantContinuousDistribution(-1);
- Assert.assertEquals(dist.getMean(), -1, 0d);
- Assert.assertEquals(dist.getVariance(), 0, 0d);
+ Assert.assertEquals(-1, dist.getMean(), 0d);
+ Assert.assertEquals(0, dist.getVariance(), 0d);
}
@Test
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 b82716c..f883e54 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
@@ -122,11 +122,11 @@ public class ExponentialDistributionTest extends ContinuousDistributionAbstractT
ExponentialDistribution dist;
dist = new ExponentialDistribution(11d);
- Assert.assertEquals(dist.getMean(), 11d, tol);
- Assert.assertEquals(dist.getVariance(), 11d * 11d, tol);
+ Assert.assertEquals(11d, dist.getMean(), tol);
+ Assert.assertEquals(11d * 11d, dist.getVariance(), tol);
dist = new ExponentialDistribution(10.5d);
- Assert.assertEquals(dist.getMean(), 10.5d, tol);
- Assert.assertEquals(dist.getVariance(), 10.5d * 10.5d, tol);
+ Assert.assertEquals(10.5d, dist.getMean(), tol);
+ Assert.assertEquals(10.5d * 10.5d, dist.getVariance(), tol);
}
}
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 fd33053..f03d817 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
@@ -126,12 +126,12 @@ public class FDistributionTest extends ContinuousDistributionAbstractTest {
Assert.assertTrue(Double.isNaN(dist.getVariance()));
dist = new FDistribution(1, 3);
- Assert.assertEquals(dist.getMean(), 3d / (3d - 2d), tol);
+ Assert.assertEquals(3d / (3d - 2d), dist.getMean(), tol);
Assert.assertTrue(Double.isNaN(dist.getVariance()));
dist = new FDistribution(1, 5);
- Assert.assertEquals(dist.getMean(), 5d / (5d - 2d), tol);
- Assert.assertEquals(dist.getVariance(), (2d * 5d * 5d * 4d) / 9d, tol);
+ Assert.assertEquals(5d / (5d - 2d), dist.getMean(), tol);
+ Assert.assertEquals((2d * 5d * 5d * 4d) / 9d, dist.getVariance(), tol);
}
@Test
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GammaDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GammaDistributionTest.java
index be2c5d2..92f5c7a 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
@@ -160,12 +160,12 @@ public class GammaDistributionTest extends ContinuousDistributionAbstractTest {
GammaDistribution dist;
dist = new GammaDistribution(1, 2);
- Assert.assertEquals(dist.getMean(), 2, tol);
- Assert.assertEquals(dist.getVariance(), 4, tol);
+ Assert.assertEquals(2, dist.getMean(), tol);
+ Assert.assertEquals(4, dist.getVariance(), tol);
dist = new GammaDistribution(1.1, 4.2);
- Assert.assertEquals(dist.getMean(), 1.1d * 4.2d, tol);
- Assert.assertEquals(dist.getVariance(), 1.1d * 4.2d * 4.2d, tol);
+ Assert.assertEquals(1.1d * 4.2d, dist.getMean(), tol);
+ Assert.assertEquals(1.1d * 4.2d * 4.2d, dist.getVariance(), tol);
}
public static double logGamma(double x) {
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 fd7db56..0881073 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
@@ -160,11 +160,11 @@ public class GeometricDistributionTest extends DiscreteDistributionAbstractTest
GeometricDistribution dist;
dist = new GeometricDistribution(0.5);
- Assert.assertEquals(dist.getMean(), (1.0d - 0.5d) / 0.5d, tol);
- Assert.assertEquals(dist.getVariance(), (1.0d - 0.5d) / (0.5d * 0.5d), tol);
+ Assert.assertEquals((1.0d - 0.5d) / 0.5d, dist.getMean(), tol);
+ Assert.assertEquals((1.0d - 0.5d) / (0.5d * 0.5d), dist.getVariance(), tol);
dist = new GeometricDistribution(0.3);
- Assert.assertEquals(dist.getMean(), (1.0d - 0.3d) / 0.3d, tol);
- Assert.assertEquals(dist.getVariance(), (1.0d - 0.3d) / (0.3d * 0.3d), tol);
+ Assert.assertEquals((1.0d - 0.3d) / 0.3d, dist.getMean(), tol);
+ Assert.assertEquals((1.0d - 0.3d) / (0.3d * 0.3d), dist.getVariance(), tol);
}
}
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 777d4a9..29af162 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
@@ -117,8 +117,8 @@ public class HypergeometricDistributionTest extends DiscreteDistributionAbstract
verifyDensities();
verifyCumulativeProbabilities();
verifyInverseCumulativeProbabilities();
- Assert.assertEquals(dist.getSupportLowerBound(), 3);
- Assert.assertEquals(dist.getSupportUpperBound(), 3);
+ Assert.assertEquals(3, dist.getSupportLowerBound());
+ Assert.assertEquals(3, dist.getSupportUpperBound());
}
/** Verify that if there are no successes, mass is concentrated on 0 */
@@ -135,8 +135,8 @@ public class HypergeometricDistributionTest extends DiscreteDistributionAbstract
verifyDensities();
verifyCumulativeProbabilities();
verifyInverseCumulativeProbabilities();
- Assert.assertEquals(dist.getSupportLowerBound(), 0);
- Assert.assertEquals(dist.getSupportUpperBound(), 0);
+ Assert.assertEquals(0, dist.getSupportLowerBound());
+ Assert.assertEquals(0, dist.getSupportUpperBound());
}
/** Verify that if sampleSize = populationSize, mass is concentrated on numberOfSuccesses */
@@ -153,8 +153,8 @@ public class HypergeometricDistributionTest extends DiscreteDistributionAbstract
verifyDensities();
verifyCumulativeProbabilities();
verifyInverseCumulativeProbabilities();
- Assert.assertEquals(dist.getSupportLowerBound(), 3);
- Assert.assertEquals(dist.getSupportUpperBound(), 3);
+ Assert.assertEquals(3, dist.getSupportLowerBound());
+ Assert.assertEquals(3, dist.getSupportUpperBound());
}
@Test(expected=IllegalArgumentException.class)
@@ -267,12 +267,12 @@ public class HypergeometricDistributionTest extends DiscreteDistributionAbstract
HypergeometricDistribution dist;
dist = new HypergeometricDistribution(1500, 40, 100);
- Assert.assertEquals(dist.getMean(), 40d * 100d / 1500d, tol);
- Assert.assertEquals(dist.getVariance(), ( 100d * 40d * (1500d - 100d) * (1500d - 40d) ) / ( (1500d * 1500d * 1499d) ), tol);
+ Assert.assertEquals(40d * 100d / 1500d, dist.getMean(), tol);
+ Assert.assertEquals(( 100d * 40d * (1500d - 100d) * (1500d - 40d) ) / ( (1500d * 1500d * 1499d) ), dist.getVariance(), tol);
dist = new HypergeometricDistribution(3000, 55, 200);
- Assert.assertEquals(dist.getMean(), 55d * 200d / 3000d, tol);
- Assert.assertEquals(dist.getVariance(), ( 200d * 55d * (3000d - 200d) * (3000d - 55d) ) / ( (3000d * 3000d * 2999d) ), tol);
+ Assert.assertEquals(55d * 200d / 3000d, dist.getMean(), tol);
+ Assert.assertEquals(( 200d * 55d * (3000d - 200d) * (3000d - 55d) ) / ( (3000d * 3000d * 2999d) ), dist.getVariance(), tol);
}
@Test
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 f7a5b4c..11274b8 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
@@ -215,10 +215,10 @@ public class LogNormalDistributionTest extends ContinuousDistributionAbstractTes
}
}
- Assert.assertEquals(d.cumulativeProbability(Double.MAX_VALUE), 1, 0);
- Assert.assertEquals(d.cumulativeProbability(-Double.MAX_VALUE), 0, 0);
- Assert.assertEquals(d.cumulativeProbability(Double.POSITIVE_INFINITY), 1, 0);
- Assert.assertEquals(d.cumulativeProbability(Double.NEGATIVE_INFINITY), 0, 0);
+ Assert.assertEquals(1, d.cumulativeProbability(Double.MAX_VALUE), 0);
+ Assert.assertEquals(0, d.cumulativeProbability(-Double.MAX_VALUE), 0);
+ Assert.assertEquals(1, d.cumulativeProbability(Double.POSITIVE_INFINITY), 0);
+ Assert.assertEquals(0, d.cumulativeProbability(Double.NEGATIVE_INFINITY), 0);
}
@Test
@@ -227,18 +227,16 @@ public class LogNormalDistributionTest extends ContinuousDistributionAbstractTes
LogNormalDistribution dist;
dist = new LogNormalDistribution(0, 1);
- Assert.assertEquals(dist.getMean(), 1.6487212707001282, tol);
- Assert.assertEquals(dist.getVariance(),
- 4.670774270471604, tol);
+ Assert.assertEquals(1.6487212707001282, dist.getMean(), tol);
+ Assert.assertEquals(4.670774270471604, dist.getVariance(), tol);
dist = new LogNormalDistribution(2.2, 1.4);
- Assert.assertEquals(dist.getMean(), 24.046753552064498, tol);
- Assert.assertEquals(dist.getVariance(),
- 3526.913651880464, tol);
+ Assert.assertEquals(24.046753552064498, dist.getMean(), tol);
+ Assert.assertEquals(3526.913651880464, dist.getVariance(), tol);
dist = new LogNormalDistribution(-2000.9, 10.4);
- Assert.assertEquals(dist.getMean(), 0.0, tol);
- Assert.assertEquals(dist.getVariance(), 0.0, tol);
+ Assert.assertEquals(0.0, dist.getMean(), tol);
+ Assert.assertEquals(0.0, dist.getVariance(), tol);
}
@Test
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 bcac87b..872e31f 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
@@ -175,10 +175,10 @@ public class NormalDistributionTest extends ContinuousDistributionAbstractTest {
}
}
- Assert.assertEquals(distribution.cumulativeProbability(Double.MAX_VALUE), 1, 0);
- Assert.assertEquals(distribution.cumulativeProbability(-Double.MAX_VALUE), 0, 0);
- Assert.assertEquals(distribution.cumulativeProbability(Double.POSITIVE_INFINITY), 1, 0);
- Assert.assertEquals(distribution.cumulativeProbability(Double.NEGATIVE_INFINITY), 0, 0);
+ Assert.assertEquals(1, distribution.cumulativeProbability(Double.MAX_VALUE), 0);
+ Assert.assertEquals(0, distribution.cumulativeProbability(-Double.MAX_VALUE), 0);
+ Assert.assertEquals(1, distribution.cumulativeProbability(Double.POSITIVE_INFINITY), 0);
+ Assert.assertEquals(0, distribution.cumulativeProbability(Double.NEGATIVE_INFINITY), 0);
}
@Test
@@ -200,15 +200,15 @@ public class NormalDistributionTest extends ContinuousDistributionAbstractTest {
NormalDistribution dist;
dist = new NormalDistribution(0, 1);
- Assert.assertEquals(dist.getMean(), 0, tol);
- Assert.assertEquals(dist.getVariance(), 1, tol);
+ Assert.assertEquals(0, dist.getMean(), tol);
+ Assert.assertEquals(1, dist.getVariance(), tol);
dist = new NormalDistribution(2.2, 1.4);
- Assert.assertEquals(dist.getMean(), 2.2, tol);
- Assert.assertEquals(dist.getVariance(), 1.4 * 1.4, tol);
+ Assert.assertEquals(2.2, dist.getMean(), tol);
+ Assert.assertEquals(1.4 * 1.4, dist.getVariance(), tol);
dist = new NormalDistribution(-2000.9, 10.4);
- Assert.assertEquals(dist.getMean(), -2000.9, tol);
- Assert.assertEquals(dist.getVariance(), 10.4 * 10.4, tol);
+ Assert.assertEquals(-2000.9, dist.getMean(), tol);
+ Assert.assertEquals(10.4 * 10.4, dist.getVariance(), tol);
}
}
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 52b0521..ed32b0b 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
@@ -179,10 +179,10 @@ public class ParetoDistributionTest extends ContinuousDistributionAbstractTest {
}
}
- Assert.assertEquals(d.cumulativeProbability(Double.MAX_VALUE), 1, 0);
- Assert.assertEquals(d.cumulativeProbability(-Double.MAX_VALUE), 0, 0);
- Assert.assertEquals(d.cumulativeProbability(Double.POSITIVE_INFINITY), 1, 0);
- Assert.assertEquals(d.cumulativeProbability(Double.NEGATIVE_INFINITY), 0, 0);
+ Assert.assertEquals(1, d.cumulativeProbability(Double.MAX_VALUE), 0);
+ Assert.assertEquals(0, d.cumulativeProbability(-Double.MAX_VALUE), 0);
+ Assert.assertEquals(1, d.cumulativeProbability(Double.POSITIVE_INFINITY), 0);
+ Assert.assertEquals(0, d.cumulativeProbability(Double.NEGATIVE_INFINITY), 0);
}
@Test
@@ -191,11 +191,11 @@ public class ParetoDistributionTest extends ContinuousDistributionAbstractTest {
ParetoDistribution dist;
dist = new ParetoDistribution(1, 1);
- Assert.assertEquals(dist.getMean(), Double.POSITIVE_INFINITY, tol);
- Assert.assertEquals(dist.getVariance(), Double.POSITIVE_INFINITY, tol);
+ Assert.assertEquals(Double.POSITIVE_INFINITY, dist.getMean(), tol);
+ Assert.assertEquals(Double.POSITIVE_INFINITY, dist.getVariance(), tol);
dist = new ParetoDistribution(2.2, 2.4);
- Assert.assertEquals(dist.getMean(), 3.771428571428, tol);
- Assert.assertEquals(dist.getVariance(), 14.816326530, tol);
+ Assert.assertEquals(3.771428571428, dist.getMean(), tol);
+ Assert.assertEquals(14.816326530, dist.getVariance(), tol);
}
}
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 3cc9f85..aa95478 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
@@ -122,11 +122,11 @@ public class PascalDistributionTest extends DiscreteDistributionAbstractTest {
PascalDistribution dist;
dist = new PascalDistribution(10, 0.5);
- Assert.assertEquals(dist.getMean(), ( 10d * 0.5d ) / 0.5d, tol);
- Assert.assertEquals(dist.getVariance(), ( 10d * 0.5d ) / (0.5d * 0.5d), tol);
+ Assert.assertEquals(( 10d * 0.5d ) / 0.5d, dist.getMean(), tol);
+ Assert.assertEquals(( 10d * 0.5d ) / (0.5d * 0.5d), dist.getVariance(), tol);
dist = new PascalDistribution(25, 0.7);
- Assert.assertEquals(dist.getMean(), ( 25d * 0.3d ) / 0.7d, tol);
- Assert.assertEquals(dist.getVariance(), ( 25d * 0.3d ) / (0.7d * 0.7d), tol);
+ Assert.assertEquals(( 25d * 0.3d ) / 0.7d, dist.getMean(), tol);
+ Assert.assertEquals(( 25d * 0.3d ) / (0.7d * 0.7d), dist.getVariance(), tol);
}
}
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 87f3c96..ed85600 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
@@ -234,11 +234,11 @@ public class PoissonDistributionTest extends DiscreteDistributionAbstractTest {
PoissonDistribution dist;
dist = new PoissonDistribution(1);
- Assert.assertEquals(dist.getMean(), 1, tol);
- Assert.assertEquals(dist.getVariance(), 1, tol);
+ Assert.assertEquals(1, dist.getMean(), tol);
+ Assert.assertEquals(1, dist.getVariance(), tol);
dist = new PoissonDistribution(11.23);
- Assert.assertEquals(dist.getMean(), 11.23, tol);
- Assert.assertEquals(dist.getVariance(), 11.23, tol);
+ Assert.assertEquals(11.23, dist.getMean(), tol);
+ Assert.assertEquals(11.23, dist.getVariance(), tol);
}
}
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 06d2efb..1b06362 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
@@ -131,12 +131,12 @@ public class TDistributionTest extends ContinuousDistributionAbstractTest {
Assert.assertTrue(Double.isNaN(dist.getVariance()));
dist = new TDistribution(1.5);
- Assert.assertEquals(dist.getMean(), 0, tol);
+ Assert.assertEquals(0, dist.getMean(), tol);
Assert.assertTrue(Double.isInfinite(dist.getVariance()));
dist = new TDistribution(5);
- Assert.assertEquals(dist.getMean(), 0, tol);
- Assert.assertEquals(dist.getVariance(), 5d / (5d - 2d), tol);
+ Assert.assertEquals(0, dist.getMean(), tol);
+ Assert.assertEquals(5d / (5d - 2d), dist.getVariance(), tol);
}
/*
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 311a74f..0aab384 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
@@ -178,15 +178,15 @@ public class TriangularDistributionTest extends ContinuousDistributionAbstractTe
TriangularDistribution dist;
dist = new TriangularDistribution(0, 0.5, 1.0);
- Assert.assertEquals(dist.getMean(), 0.5, 0);
- Assert.assertEquals(dist.getVariance(), 1 / 24.0, 0);
+ Assert.assertEquals(0.5, dist.getMean(), 0);
+ Assert.assertEquals(1 / 24.0, dist.getVariance(), 0);
dist = new TriangularDistribution(0, 1, 1);
- Assert.assertEquals(dist.getMean(), 2 / 3.0, 0);
- Assert.assertEquals(dist.getVariance(), 1 / 18.0, 0);
+ Assert.assertEquals(2 / 3.0, dist.getMean(), 0);
+ Assert.assertEquals(1 / 18.0, dist.getVariance(), 0);
dist = new TriangularDistribution(-3, 2, 12);
- Assert.assertEquals(dist.getMean(), 3 + (2 / 3.0), 0);
- Assert.assertEquals(dist.getVariance(), 175 / 18.0, 0);
+ Assert.assertEquals(3 + (2 / 3.0), dist.getMean(), 0);
+ Assert.assertEquals(175 / 18.0, dist.getVariance(), 0);
}
}
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 5f122db..aab015b 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
@@ -98,16 +98,16 @@ public class UniformContinuousDistributionTest extends ContinuousDistributionAbs
UniformContinuousDistribution dist;
dist = new UniformContinuousDistribution(0, 1);
- Assert.assertEquals(dist.getMean(), 0.5, 0);
- Assert.assertEquals(dist.getVariance(), 1/12.0, 0);
+ Assert.assertEquals(0.5, dist.getMean(), 0);
+ Assert.assertEquals(1/12.0, dist.getVariance(), 0);
dist = new UniformContinuousDistribution(-1.5, 0.6);
- Assert.assertEquals(dist.getMean(), -0.45, 0);
- Assert.assertEquals(dist.getVariance(), 0.3675, 0);
+ Assert.assertEquals(-0.45, dist.getMean(), 0);
+ Assert.assertEquals(0.3675, dist.getVariance(), 0);
dist = new UniformContinuousDistribution(-0.5, 1.25);
- Assert.assertEquals(dist.getMean(), 0.375, 0);
- Assert.assertEquals(dist.getVariance(), 0.2552083333333333, 0);
+ Assert.assertEquals(0.375, dist.getMean(), 0);
+ Assert.assertEquals(0.2552083333333333, dist.getVariance(), 0);
}
/**
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 b9cac54..a58ab0c 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
@@ -90,12 +90,12 @@ public class UniformDiscreteDistributionTest extends DiscreteDistributionAbstrac
UniformDiscreteDistribution dist;
dist = new UniformDiscreteDistribution(0, 5);
- Assert.assertEquals(dist.getMean(), 2.5, 0);
- Assert.assertEquals(dist.getVariance(), 35 / 12.0, 0);
+ Assert.assertEquals(2.5, dist.getMean(), 0);
+ Assert.assertEquals(35 / 12.0, dist.getVariance(), 0);
dist = new UniformDiscreteDistribution(0, 1);
- Assert.assertEquals(dist.getMean(), 0.5, 0);
- Assert.assertEquals(dist.getVariance(), 3 / 12.0, 0);
+ Assert.assertEquals(0.5, dist.getMean(), 0);
+ Assert.assertEquals(3 / 12.0, dist.getVariance(), 0);
}
// MATH-1141
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 006b798..33ba189 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
@@ -103,16 +103,16 @@ public class WeibullDistributionTest extends ContinuousDistributionAbstractTest
WeibullDistribution dist;
dist = new WeibullDistribution(2.5, 3.5);
- // In R: 3.5*gamma(1+(1/2.5)) (or emperically: mean(rweibull(10000, 2.5, 3.5)))
- Assert.assertEquals(dist.getMean(), 3.5 * Math.exp(LogGamma.value(1 + (1 / 2.5))), tol);
- Assert.assertEquals(dist.getVariance(), (3.5 * 3.5) *
+ // In R: 3.5*gamma(1+(1/2.5)) (or empirically: mean(rweibull(10000, 2.5, 3.5)))
+ Assert.assertEquals(3.5 * Math.exp(LogGamma.value(1 + (1 / 2.5))), dist.getMean(), tol);
+ Assert.assertEquals((3.5 * 3.5) *
Math.exp(LogGamma.value(1 + (2 / 2.5))) -
- (dist.getMean() * dist.getMean()), tol);
+ (dist.getMean() * dist.getMean()), dist.getVariance(), tol);
dist = new WeibullDistribution(10.4, 2.222);
- Assert.assertEquals(dist.getMean(), 2.222 * Math.exp(LogGamma.value(1 + (1 / 10.4))), tol);
- Assert.assertEquals(dist.getVariance(), (2.222 * 2.222) *
+ Assert.assertEquals(2.222 * Math.exp(LogGamma.value(1 + (1 / 10.4))), dist.getMean(), tol);
+ Assert.assertEquals((2.222 * 2.222) *
Math.exp(LogGamma.value(1 + (2 / 10.4))) -
- (dist.getMean() * dist.getMean()), tol);
+ (dist.getMean() * dist.getMean()), dist.getVariance(), tol);
}
}
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 7d62948..c43328c 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
@@ -92,14 +92,14 @@ public class ZipfDistributionTest extends DiscreteDistributionAbstractTest {
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
@@ -113,11 +113,10 @@ public class ZipfDistributionTest extends DiscreteDistributionAbstractTest {
ZipfDistribution dist;
dist = new ZipfDistribution(2, 0.5);
- Assert.assertEquals(dist.getMean(), Math.sqrt(2), tol);
- Assert.assertEquals(dist.getVariance(), 0.24264068711928521, tol);
+ Assert.assertEquals(Math.sqrt(2), dist.getMean(), tol);
+ Assert.assertEquals(0.24264068711928521, dist.getVariance(), tol);
}
-
/**
* Test sampling for various number of points and exponents.
*/