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 11:47:28 UTC
[commons-statistics] branch master updated (f929f96 -> 33af4f6)
This is an automated email from the ASF dual-hosted git repository.
aherbert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-statistics.git.
from f929f96 Added pmd plugin configuration to build.
new 2eb544c Comment deliberately default methods and fields.
new 8cd79ab Consolidate checkstyle config for build.
new 33af4f6 Fixed checkstyle for test sources
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../AbstractContinuousDistribution.java | 8 +++---
.../distribution/DistributionException.java | 12 ++++-----
.../distribution/SaddlePointExpansion.java | 8 +++---
.../AbstractContinuousDistributionTest.java | 5 ++--
.../AbstractDiscreteDistributionTest.java | 2 +-
.../distribution/BetaDistributionTest.java | 16 ++++++------
.../distribution/BinomialDistributionTest.java | 23 +++++++++--------
.../ContinuousDistributionAbstractTest.java | 30 +++++++++++-----------
.../DiscreteDistributionAbstractTest.java | 18 ++++++-------
.../statistics/distribution/FDistributionTest.java | 2 +-
.../distribution/GammaDistributionTest.java | 9 +++----
.../distribution/GeometricDistributionTest.java | 23 +++++++++--------
.../distribution/NormalDistributionTest.java | 13 +++++-----
.../distribution/PoissonDistributionTest.java | 12 ++++-----
.../commons/statistics/distribution/TestUtils.java | 2 +-
.../distribution/ZipfDistributionTest.java | 1 -
pom.xml | 25 +++++-------------
.../checkstyle-suppressions.xml} | 11 +++++---
18 files changed, 107 insertions(+), 113 deletions(-)
copy src/main/resources/{clirr/clirr-ignored.xml => checkstyle/checkstyle-suppressions.xml} (72%)
[commons-statistics] 01/03: Comment deliberately default methods
and fields.
Posted by ah...@apache.org.
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 2eb544c38623b937613256610652be15ab1d7c26
Author: aherbert <ah...@apache.org>
AuthorDate: Mon May 20 12:08:17 2019 +0100
Comment deliberately default methods and fields.
---
.../distribution/AbstractContinuousDistribution.java | 8 ++++----
.../statistics/distribution/DistributionException.java | 12 ++++++------
.../statistics/distribution/SaddlePointExpansion.java | 8 ++++----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractContinuousDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractContinuousDistribution.java
index c760078..e8d19c3 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractContinuousDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractContinuousDistribution.java
@@ -253,10 +253,10 @@ abstract class AbstractContinuousDistribution
* @param max Upper bound.
* @return the root.
*/
- double solve(DoubleUnaryOperator func,
- double min,
- double initial,
- double max) {
+ /* default */ double solve(DoubleUnaryOperator func,
+ double min,
+ double initial,
+ double max) {
if (min > max) {
throw new DistributionException(DistributionException.TOO_LARGE, min, max);
}
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/DistributionException.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/DistributionException.java
index 31d7adc..0324080 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/DistributionException.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/DistributionException.java
@@ -23,17 +23,17 @@ import java.text.MessageFormat;
*/
class DistributionException extends IllegalArgumentException {
/** Error message for "too large" condition. */
- static final String TOO_LARGE = "{0} > {1}";
+ /* default */ static final String TOO_LARGE = "{0} > {1}";
/** Error message for "too small" condition. */
- static final String TOO_SMALL = "{0} < {1}";
+ /* default */ static final String TOO_SMALL = "{0} < {1}";
/** Error message for "out of range" condition. */
- static final String OUT_OF_RANGE = "Number {0} is out of range [{1}, {2}]";
+ /* default */ static final String OUT_OF_RANGE = "Number {0} is out of range [{1}, {2}]";
/** Error message for "out of range" condition. */
- static final String NEGATIVE = "Number {0} is negative";
+ /* default */ static final String NEGATIVE = "Number {0} is negative";
/** Error message for "mismatch" condition. */
- static final String MISMATCH = "Expected {1} but was {0}";
+ /* default */ static final String MISMATCH = "Expected {1} but was {0}";
/** Error message for "failed bracketing" condition. */
- static final String BRACKETING = "No bracketing: f({0})={1}, f({2})={3}";
+ /* default */ static final String BRACKETING = "No bracketing: f({0})={1}, f({2})={3}";
/** Serializable version identifier. */
private static final long serialVersionUID = 20180119L;
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/SaddlePointExpansion.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/SaddlePointExpansion.java
index 7bb847a..0ff3dd5 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/SaddlePointExpansion.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/SaddlePointExpansion.java
@@ -28,7 +28,7 @@ import org.apache.commons.numbers.gamma.LogGamma;
*
* @since 1.0
*/
-final class SaddlePointExpansion {
+/* default */ final class SaddlePointExpansion {
/** 2 π */
private static final double TWO_PI = 2 * Math.PI;
/** 1/2 * log(2 π). */
@@ -88,7 +88,7 @@ final class SaddlePointExpansion {
* @param z the value.
* @return the Striling's series error.
*/
- static double getStirlingError(double z) {
+ /* default */ static double getStirlingError(double z) {
double ret;
if (z < 15.0) {
double z2 = 2.0 * z;
@@ -126,7 +126,7 @@ final class SaddlePointExpansion {
* @param mu the average.
* @return a part of the deviance.
*/
- static double getDeviancePart(double x, double mu) {
+ /* default */ static double getDeviancePart(double x, double mu) {
double ret;
if (Math.abs(x - mu) < 0.1 * (x + mu)) {
double d = x - mu;
@@ -162,7 +162,7 @@ final class SaddlePointExpansion {
* @param q the probability of failure (1 - p).
* @return log(p(x)).
*/
- static double logBinomialProbability(int x, int n, double p, double q) {
+ /* default */ static double logBinomialProbability(int x, int n, double p, double q) {
double ret;
if (x == 0) {
if (p < 0.1) {
[commons-statistics] 03/03: Fixed checkstyle for test sources
Posted by ah...@apache.org.
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 33af4f6e3d612c940d37790068a228d5564ab7eb
Author: aherbert <ah...@apache.org>
AuthorDate: Mon May 20 12:47:25 2019 +0100
Fixed checkstyle for test sources
---
.../AbstractContinuousDistributionTest.java | 5 ++--
.../AbstractDiscreteDistributionTest.java | 2 +-
.../distribution/BetaDistributionTest.java | 16 ++++++------
.../distribution/BinomialDistributionTest.java | 23 +++++++++--------
.../ContinuousDistributionAbstractTest.java | 30 +++++++++++-----------
.../DiscreteDistributionAbstractTest.java | 18 ++++++-------
.../statistics/distribution/FDistributionTest.java | 2 +-
.../distribution/GammaDistributionTest.java | 9 +++----
.../distribution/GeometricDistributionTest.java | 23 +++++++++--------
.../distribution/NormalDistributionTest.java | 13 +++++-----
.../distribution/PoissonDistributionTest.java | 12 ++++-----
.../commons/statistics/distribution/TestUtils.java | 2 +-
.../distribution/ZipfDistributionTest.java | 1 -
13 files changed, 80 insertions(+), 76 deletions(-)
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractContinuousDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractContinuousDistributionTest.java
index b47e5ad..8fbce70 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractContinuousDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractContinuousDistributionTest.java
@@ -77,9 +77,8 @@ public class AbstractContinuousDistributionTest {
public double getVariance() {
final double meanX = getMean();
final double meanX2;
- meanX2 = ((x0 * x0 + x0 * x1 + x1 * x1) * p12 + (x2 * x2 + x2
- * x3 + x3 * x3)
- * (1.0 - p12)) / 3.0;
+ meanX2 = ((x0 * x0 + x0 * x1 + x1 * x1) * p12 +
+ (x2 * x2 + x2 * x3 + x3 * x3) * (1.0 - p12)) / 3.0;
return meanX2 - meanX * meanX;
}
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistributionTest.java
index 2e8c7ae..505f768 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistributionTest.java
@@ -43,7 +43,7 @@ public class AbstractDiscreteDistributionTest {
Assert.assertEquals(5, diceDistribution.inverseCumulativeProbability((5d-precision)/6d));//Can't use Double.MIN
Assert.assertEquals(6, diceDistribution.inverseCumulativeProbability((5d+precision)/6d));
Assert.assertEquals(6, diceDistribution.inverseCumulativeProbability((6d-precision)/6d));//Can't use Double.MIN
- Assert.assertEquals(6, diceDistribution.inverseCumulativeProbability((6d)/6d));
+ Assert.assertEquals(6, diceDistribution.inverseCumulativeProbability(1d));
}
@Test
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 91c23b2..c4ce76e 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
@@ -27,8 +27,8 @@ import org.junit.Test;
public class BetaDistributionTest {
- static final double[] alphaBetas = {0.1, 1, 10, 100, 1000};
- static final double epsilon = StatUtils.min(alphaBetas);
+ static final double[] ALPHA_BETAS = {0.1, 1, 10, 100, 1000};
+ static final double EPSILON = StatUtils.min(ALPHA_BETAS);
@Test
public void testCumulative() {
@@ -317,8 +317,8 @@ public class BetaDistributionTest {
final UniformRandomProvider rng = RandomSource.create(RandomSource.WELL_1024_A,
123456789L);
final int numSamples = 1000;
- for (final double alpha : alphaBetas) {
- for (final double beta : alphaBetas) {
+ for (final double alpha : ALPHA_BETAS) {
+ for (final double beta : ALPHA_BETAS) {
final BetaDistribution betaDistribution = new BetaDistribution(alpha, beta);
final double[] observed = AbstractContinuousDistribution.sample(numSamples,
betaDistribution.createSampler(rng));
@@ -327,10 +327,10 @@ public class BetaDistributionTest {
final String distribution = String.format("Beta(%.2f, %.2f)", alpha, beta);
Assert.assertEquals(String.format("E[%s]", distribution),
betaDistribution.getMean(),
- StatUtils.mean(observed), epsilon);
+ StatUtils.mean(observed), EPSILON);
Assert.assertEquals(String.format("Var[%s]", distribution),
betaDistribution.getVariance(),
- StatUtils.variance(observed), epsilon);
+ StatUtils.variance(observed), EPSILON);
}
}
}
@@ -342,8 +342,8 @@ public class BetaDistributionTest {
final int numSamples = 1000;
final double level = 0.01;
- for (final double alpha : alphaBetas) {
- for (final double beta : alphaBetas) {
+ for (final double alpha : ALPHA_BETAS) {
+ for (final double beta : ALPHA_BETAS) {
final BetaDistribution betaDistribution = new BetaDistribution(alpha, beta);
final ContinuousDistribution.Sampler sampler = betaDistribution.createSampler(rng);
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 ff64971..1e8c2e5 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
@@ -1,15 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
- * or agreed to in writing, software distributed under the License is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.commons.statistics.distribution;
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ContinuousDistributionAbstractTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ContinuousDistributionAbstractTest.java
index a6176f3..92af1a4 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ContinuousDistributionAbstractTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ContinuousDistributionAbstractTest.java
@@ -107,12 +107,12 @@ public abstract class ContinuousDistributionAbstractTest {
* The default implementation simply computes the logarithm
* of each value returned by {@link #makeDensityTestValues()}.*/
public double[] makeLogDensityTestValues() {
- final double[] densityTestValues = makeDensityTestValues();
- final double[] logDensityTestValues = new double[densityTestValues.length];
- for (int i = 0; i < densityTestValues.length; i++) {
- logDensityTestValues[i] = Math.log(densityTestValues[i]);
+ final double[] density = makeDensityTestValues();
+ final double[] logDensity = new double[density.length];
+ for (int i = 0; i < density.length; i++) {
+ logDensity[i] = Math.log(density[i]);
}
- return logDensityTestValues;
+ return logDensity;
}
//---- Default implementations of inverse test data generation methods ----
@@ -166,8 +166,8 @@ public abstract class ContinuousDistributionAbstractTest {
protected void verifyCumulativeProbabilities() {
// verify cumulativeProbability(double)
for (int i = 0; i < cumulativeTestPoints.length; i++) {
- TestUtils.assertEquals("Incorrect cumulative probability value returned for "
- + cumulativeTestPoints[i], cumulativeTestValues[i],
+ TestUtils.assertEquals("Incorrect cumulative probability value returned for " +
+ cumulativeTestPoints[i], cumulativeTestValues[i],
distribution.cumulativeProbability(cumulativeTestPoints[i]),
getTolerance());
}
@@ -196,8 +196,8 @@ public abstract class ContinuousDistributionAbstractTest {
*/
protected void verifyInverseCumulativeProbabilities() {
for (int i = 0; i < inverseCumulativeTestPoints.length; i++) {
- TestUtils.assertEquals("Incorrect inverse cumulative probability value returned for "
- + inverseCumulativeTestPoints[i], inverseCumulativeTestValues[i],
+ TestUtils.assertEquals("Incorrect inverse cumulative probability value returned for " +
+ inverseCumulativeTestPoints[i], inverseCumulativeTestValues[i],
distribution.inverseCumulativeProbability(inverseCumulativeTestPoints[i]),
getTolerance());
}
@@ -208,8 +208,8 @@ public abstract class ContinuousDistributionAbstractTest {
*/
protected void verifyDensities() {
for (int i = 0; i < cumulativeTestPoints.length; i++) {
- TestUtils.assertEquals("Incorrect probability density value returned for "
- + cumulativeTestPoints[i], densityTestValues[i],
+ TestUtils.assertEquals("Incorrect probability density value returned for " +
+ cumulativeTestPoints[i], densityTestValues[i],
distribution.density(cumulativeTestPoints[i]),
getTolerance());
}
@@ -220,8 +220,8 @@ public abstract class ContinuousDistributionAbstractTest {
*/
protected void verifyLogDensities() {
for (int i = 0; i < cumulativeTestPoints.length; i++) {
- TestUtils.assertEquals("Incorrect probability density value returned for "
- + cumulativeTestPoints[i], logDensityTestValues[i],
+ TestUtils.assertEquals("Incorrect probability density value returned for " +
+ cumulativeTestPoints[i], logDensityTestValues[i],
distribution.logDensity(cumulativeTestPoints[i]),
getTolerance());
}
@@ -284,8 +284,8 @@ public abstract class ContinuousDistributionAbstractTest {
double diff = distribution.cumulativeProbability(upper) -
distribution.cumulativeProbability(lower);
double direct = distribution.probability(lower, upper);
- TestUtils.assertEquals("Inconsistent probability for ("
- + lower + "," + upper + ")", diff, direct, tolerance);
+ TestUtils.assertEquals("Inconsistent probability for (" +
+ lower + "," + upper + ")", diff, direct, tolerance);
}
}
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 ab0e0a1..88b49c3 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
@@ -92,12 +92,12 @@ public abstract class DiscreteDistributionAbstractTest {
* @return double[] the default logarithmic probability density test expected values.
*/
public double[] makeLogDensityTestValues() {
- final double[] densityTestValues = makeDensityTestValues();
- final double[] logDensityTestValues = new double[densityTestValues.length];
- for (int i = 0; i < densityTestValues.length; i++) {
- logDensityTestValues[i] = Math.log(densityTestValues[i]);
+ final double[] density = makeDensityTestValues();
+ final double[] logDensity = new double[density.length];
+ for (int i = 0; i < density.length; i++) {
+ logDensity[i] = Math.log(density[i]);
}
- return logDensityTestValues;
+ return logDensity;
}
/** Creates the default cumulative probability density test input values */
@@ -190,8 +190,8 @@ public abstract class DiscreteDistributionAbstractTest {
*/
protected void verifyInverseCumulativeProbabilities() {
for (int i = 0; i < inverseCumulativeTestPoints.length; i++) {
- Assert.assertEquals("Incorrect inverse cumulative probability value returned for "
- + inverseCumulativeTestPoints[i], inverseCumulativeTestValues[i],
+ Assert.assertEquals("Incorrect inverse cumulative probability value returned for " +
+ inverseCumulativeTestPoints[i], inverseCumulativeTestValues[i],
distribution.inverseCumulativeProbability(inverseCumulativeTestPoints[i]));
}
}
@@ -275,7 +275,7 @@ public abstract class DiscreteDistributionAbstractTest {
double[] densityValues = makeDensityTestValues();
int sampleSize = 1000;
int length = TestUtils.eliminateZeroMassPoints(densityPoints, densityValues);
- AbstractDiscreteDistribution distribution = (AbstractDiscreteDistribution) makeDistribution();
+ AbstractDiscreteDistribution dist = (AbstractDiscreteDistribution) makeDistribution();
double[] expectedCounts = new double[length];
long[] observedCounts = new long[length];
for (int i = 0; i < length; i++) {
@@ -283,7 +283,7 @@ public abstract class DiscreteDistributionAbstractTest {
}
// Use fixed seed.
final DiscreteDistribution.Sampler sampler =
- distribution.createSampler(RandomSource.create(RandomSource.WELL_512_A,
+ dist.createSampler(RandomSource.create(RandomSource.WELL_512_A,
1000));
int[] sample = AbstractDiscreteDistribution.sample(sampleSize, sampler);
for (int i = 0; i < sampleSize; i++) {
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 e286667..fd33053 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
@@ -143,7 +143,7 @@ public class FDistributionTest extends ContinuousDistributionAbstractTest {
FDistribution f = new FDistribution(200000, 200000);
double result = f.inverseCumulativeProbability(prob);
Assert.assertTrue(result < 1.0);
- } catch (Exception e) {
+ } catch (AssertionError ex) {
Assert.fail("Failing to calculate inverse cumulative probability");
}
}
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 a281748..be2c5d2 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
@@ -35,6 +35,8 @@ import org.junit.Test;
*/
public class GammaDistributionTest extends ContinuousDistributionAbstractTest {
+ private static final double HALF_LOG_2_PI = 0.5 * Math.log(2.0 * Math.PI);
+
//-------------- Implementations for abstract methods -----------------------
/** Creates the default continuous distribution instance to use in tests. */
@@ -166,8 +168,6 @@ public class GammaDistributionTest extends ContinuousDistributionAbstractTest {
Assert.assertEquals(dist.getVariance(), 1.1d * 4.2d * 4.2d, tol);
}
- private static final double HALF_LOG_2_PI = 0.5 * Math.log(2.0 * Math.PI);
-
public static double logGamma(double x) {
/*
* This is a copy of
@@ -242,9 +242,8 @@ public class GammaDistributionTest extends ContinuousDistributionAbstractTest {
final double ulp = Math.ulp(expected);
final double actualOld = density(x, shape, 1.0);
final double actualNew = distribution.density(x);
- final double errOld, errNew;
- errOld = Math.abs((actualOld - expected) / ulp);
- errNew = Math.abs((actualNew - expected) / ulp);
+ final double errOld = Math.abs((actualOld - expected) / ulp);
+ final double errNew = Math.abs((actualNew - expected) / ulp);
if (Double.isNaN(actualOld) || Double.isInfinite(actualOld)) {
Assert.assertFalse(msg, Double.isNaN(actualNew));
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 128e372..fd7db56 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
@@ -1,15 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
- * or agreed to in writing, software distributed under the License is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.commons.statistics.distribution;
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 9262252..bcac87b 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
@@ -28,6 +28,8 @@ import org.junit.Test;
*/
public class NormalDistributionTest extends ContinuousDistributionAbstractTest {
+ private static final double DEFAULT_TOLERANCE = 1e-7;
+
//-------------- Implementations for abstract methods -----------------------
/** Creates the default real distribution instance to use in tests. */
@@ -59,11 +61,10 @@ public class NormalDistributionTest extends ContinuousDistributionAbstractTest {
}
// --------------------- Override tolerance --------------
- private double defaultTolerance = 1e-7;
@Override
public void setUp() {
super.setUp();
- setTolerance(defaultTolerance);
+ setTolerance(DEFAULT_TOLERANCE);
}
//---------------------------- Additional test cases -------------------------
@@ -184,13 +185,13 @@ public class NormalDistributionTest extends ContinuousDistributionAbstractTest {
public void testMath280() {
NormalDistribution normal = new NormalDistribution(0,1);
double result = normal.inverseCumulativeProbability(0.9986501019683698);
- Assert.assertEquals(3.0, result, defaultTolerance);
+ Assert.assertEquals(3.0, result, DEFAULT_TOLERANCE);
result = normal.inverseCumulativeProbability(0.841344746068543);
- Assert.assertEquals(1.0, result, defaultTolerance);
+ Assert.assertEquals(1.0, result, DEFAULT_TOLERANCE);
result = normal.inverseCumulativeProbability(0.9999683287581673);
- Assert.assertEquals(4.0, result, defaultTolerance);
+ Assert.assertEquals(4.0, result, DEFAULT_TOLERANCE);
result = normal.inverseCumulativeProbability(0.9772498680518209);
- Assert.assertEquals(2.0, result, defaultTolerance);
+ Assert.assertEquals(2.0, result, DEFAULT_TOLERANCE);
}
@Test
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 d0f59cf..87f3c96 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
@@ -123,13 +123,13 @@ public class PoissonDistributionTest extends DiscreteDistributionAbstractTest {
@Test
public void testNormalApproximateProbability() {
PoissonDistribution dist = new PoissonDistribution(100);
- double result = dist.normalApproximateProbability(110)
- - dist.normalApproximateProbability(89);
+ double result = dist.normalApproximateProbability(110) -
+ dist.normalApproximateProbability(89);
Assert.assertEquals(0.706281887248, result, 1e-10);
dist = new PoissonDistribution(10000);
- result = dist.normalApproximateProbability(10200)
- - dist.normalApproximateProbability(9899);
+ result = dist.normalApproximateProbability(10200) -
+ dist.normalApproximateProbability(9899);
Assert.assertEquals(0.820070051552, result, 1E-10);
}
@@ -173,7 +173,7 @@ public class PoissonDistributionTest extends DiscreteDistributionAbstractTest {
Assert.assertTrue("Zero cum probaility returned for mean = " +
mean + " x = " + x, p > 0);
}
- } catch (Exception ex) {
+ } catch (AssertionError ex) {
Assert.fail("mean of " + mean + " and x of " + x + " caused " + ex.getMessage());
}
x -= dx;
@@ -219,7 +219,7 @@ public class PoissonDistributionTest extends DiscreteDistributionAbstractTest {
// Verify that returned value satisties definition
Assert.assertTrue(p <= dist.cumulativeProbability(ret));
Assert.assertTrue(p > dist.cumulativeProbability(ret - 1));
- } catch (Exception ex) {
+ } catch (AssertionError ex) {
Assert.fail("mean of " + mean + " and p of " + p + " caused " + ex.getMessage());
}
p += dp;
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TestUtils.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TestUtils.java
index 8a074d0..c2d4eb0 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TestUtils.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TestUtils.java
@@ -141,7 +141,7 @@ public class TestUtils {
Assert.fail(out.toString());
}
}
-
+
/**
* Asserts the null hypothesis for a ChiSquare test. Fails and dumps arguments and test
* statistics if the null hypothesis can be rejected with confidence 100 * (1 - alpha)%
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 cb25c95..7d62948 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
@@ -19,7 +19,6 @@ package org.apache.commons.statistics.distribution;
import org.apache.commons.rng.simple.RandomSource;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
/**
[commons-statistics] 02/03: Consolidate checkstyle config for build.
Posted by ah...@apache.org.
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 8cd79abd662663a1bef090f8c79c587273fceb84
Author: aherbert <ah...@apache.org>
AuthorDate: Mon May 20 12:47:05 2019 +0100
Consolidate checkstyle config for build.
Enable fail on violation and checks for test sources.
Add checkstyle suppressions file to exclude tests.
---
pom.xml | 25 ++++++----------------
.../checkstyle/checkstyle-suppressions.xml | 24 +++++++++++++++++++++
2 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index 842ea30..3749647 100644
--- a/pom.xml
+++ b/pom.xml
@@ -228,11 +228,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${statistics.checkstyle.version}</version>
<configuration>
<configLocation>${statistics.parent.dir}/src/main/resources/checkstyle/checkstyle.xml</configLocation>
<headerLocation>${statistics.parent.dir}/src/main/resources/checkstyle/license-header.txt</headerLocation>
+ <suppressionsLocation>${statistics.parent.dir}/src/main/resources/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
<enableRulesSummary>false</enableRulesSummary>
- <includeResources>false</includeResources>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <logViolationsToConsole>false</logViolationsToConsole>
+ <failOnViolation>true</failOnViolation>
+ <resourceExcludes>NOTICE.txt,LICENSE.txt,**/maven-archiver/pom.properties</resourceExcludes>
</configuration>
<executions>
<execution>
@@ -295,24 +300,6 @@
</configuration>
</plugin>
</plugins>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${statistics.checkstyle.version}</version>
- <configuration>
- <includeTestSourceDirectory>false</includeTestSourceDirectory>
- <configLocation>${statistics.parent.dir}/src/main/resources/checkstyle/checkstyle.xml</configLocation>
- <headerLocation>${statistics.parent.dir}/src/main/resources/checkstyle/license-header.txt</headerLocation>
- <logViolationsToConsole>false</logViolationsToConsole>
- <failOnViolation>false</failOnViolation>
- <resourceExcludes>NOTICE.txt,LICENSE.txt</resourceExcludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<reporting>
diff --git a/src/main/resources/checkstyle/checkstyle-suppressions.xml b/src/main/resources/checkstyle/checkstyle-suppressions.xml
new file mode 100644
index 0000000..6ccaa63
--- /dev/null
+++ b/src/main/resources/checkstyle/checkstyle-suppressions.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!DOCTYPE suppressions PUBLIC
+ "-//Checkstyle//DTD SuppressionFilter Configuration 1.0//EN"
+ "https://checkstyle.org/dtds/suppressions_1_0.dtd">
+<suppressions>
+ <suppress checks="Javadoc" files=".*[/\\]test[/\\].*" />
+ <suppress checks="MultipleStringLiterals" files=".*[/\\]test[/\\].*" />
+</suppressions>