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 2c1f4aaa5958bba7b8cbd930634309e33e6fd6d4
Author: aherbert <aherb...@apache.org>
AuthorDate: Mon Feb 22 13:30:22 2021 +0000
Use DistributionException constants for invalid range
Replace the use of:
TOO_SMALL : %s < %s
TOO_LARGE : %s > %s
With
INVALID_RANGE_LOW_GTE_HIGH : %s >= %s
INVALID_RANGE_LOW_GT_HIGH : %s > %s
where the two arguments are specifically a lower and upper bound of a
range.
---
.../statistics/distribution/AbstractDiscreteDistribution.java | 6 +++---
.../commons/statistics/distribution/ContinuousDistribution.java | 2 +-
.../commons/statistics/distribution/DistributionException.java | 6 ++++--
.../commons/statistics/distribution/LogNormalDistribution.java | 2 +-
.../apache/commons/statistics/distribution/NormalDistribution.java | 2 +-
.../commons/statistics/distribution/TriangularDistribution.java | 2 +-
.../statistics/distribution/TruncatedNormalDistribution.java | 4 ++--
.../statistics/distribution/UniformContinuousDistribution.java | 2 +-
.../statistics/distribution/UniformDiscreteDistribution.java | 2 +-
9 files changed, 15 insertions(+), 13 deletions(-)
diff --git
a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistribution.java
b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistribution.java
index 5821181..67ca871 100644
---
a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistribution.java
+++
b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistribution.java
@@ -35,9 +35,9 @@ abstract class AbstractDiscreteDistribution
@Override
public double probability(int x0,
int x1) {
- if (x1 < x0) {
- throw new DistributionException(DistributionException.TOO_SMALL,
- x1, x0);
+ if (x0 > x1) {
+ throw new
DistributionException(DistributionException.INVALID_RANGE_LOW_GT_HIGH,
+ x0, x1);
}
return cumulativeProbability(x1) - cumulativeProbability(x0);
}
diff --git
a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ContinuousDistribution.java
b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ContinuousDistribution.java
index 9bf59e0..19f7584 100644
---
a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ContinuousDistribution.java
+++
b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ContinuousDistribution.java
@@ -51,7 +51,7 @@ public interface ContinuousDistribution {
default double probability(double x0,
double x1) {
if (x0 > x1) {
- throw new DistributionException(DistributionException.TOO_LARGE,
x0, x1);
+ throw new
DistributionException(DistributionException.INVALID_RANGE_LOW_GT_HIGH, x0, x1);
}
return cumulativeProbability(x1) - cumulativeProbability(x0);
}
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 8aa7d82..bb8747e 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
@@ -28,8 +28,10 @@ class DistributionException extends IllegalArgumentException
{
static final String TOO_SMALL = "%s < %s";
/** Error message for "out of range" condition. */
static final String OUT_OF_RANGE = "Number %s is out of range [%s, %s]";
- /** Error message for "invalid range" condition. */
- static final String INVALID_RANGE = "Lower bound %s is not below the upper
bound %s";
+ /** Error message for "invalid range" condition when "lower >= upper". */
+ static final String INVALID_RANGE_LOW_GTE_HIGH = "Lower bound %s >= upper
bound %s";
+ /** Error message for "invalid range" condition when "lower > upper". */
+ static final String INVALID_RANGE_LOW_GT_HIGH = "Lower bound %s > upper
bound %s";
/** Error message for "invalid probability" condition. */
static final String INVALID_PROBABILITY = "Not a probability: %s is out of
range [0, 1]";
/** Error message for "out of range" condition. */
diff --git
a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LogNormalDistribution.java
b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LogNormalDistribution.java
index cb05e5e..1059032 100644
---
a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LogNormalDistribution.java
+++
b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LogNormalDistribution.java
@@ -159,7 +159,7 @@ public class LogNormalDistribution extends
AbstractContinuousDistribution {
public double probability(double x0,
double x1) {
if (x0 > x1) {
- throw new DistributionException(DistributionException.TOO_LARGE,
+ throw new
DistributionException(DistributionException.INVALID_RANGE_LOW_GT_HIGH,
x0, x1);
}
if (x0 <= 0) {
diff --git
a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/NormalDistribution.java
b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/NormalDistribution.java
index e30e230..3abeded 100644
---
a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/NormalDistribution.java
+++
b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/NormalDistribution.java
@@ -109,7 +109,7 @@ public class NormalDistribution extends
AbstractContinuousDistribution {
public double probability(double x0,
double x1) {
if (x0 > x1) {
- throw new DistributionException(DistributionException.TOO_LARGE,
+ throw new
DistributionException(DistributionException.INVALID_RANGE_LOW_GT_HIGH,
x0, x1);
}
final double denom = standardDeviation * SQRT2;
diff --git
a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/TriangularDistribution.java
b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/TriangularDistribution.java
index b55d2e4..0552ce5 100644
---
a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/TriangularDistribution.java
+++
b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/TriangularDistribution.java
@@ -44,7 +44,7 @@ public class TriangularDistribution extends
AbstractContinuousDistribution {
double c,
double b) {
if (a >= b) {
- throw new DistributionException(DistributionException.TOO_LARGE,
+ throw new
DistributionException(DistributionException.INVALID_RANGE_LOW_GTE_HIGH,
a, b);
}
if (c < a) {
diff --git
a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/TruncatedNormalDistribution.java
b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/TruncatedNormalDistribution.java
index 935b63a..b7e77c0 100644
---
a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/TruncatedNormalDistribution.java
+++
b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/TruncatedNormalDistribution.java
@@ -62,8 +62,8 @@ public class TruncatedNormalDistribution extends
AbstractContinuousDistribution
if (sd <= 0) {
throw new
DistributionException(DistributionException.NOT_STRICTLY_POSITIVE, sd);
}
- if (upper <= lower) {
- throw new
DistributionException(DistributionException.INVALID_RANGE, lower, upper);
+ if (lower >= upper) {
+ throw new
DistributionException(DistributionException.INVALID_RANGE_LOW_GTE_HIGH, lower,
upper);
}
this.lower = lower;
diff --git
a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformContinuousDistribution.java
b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformContinuousDistribution.java
index 5d9780d..cf82be8 100644
---
a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformContinuousDistribution.java
+++
b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformContinuousDistribution.java
@@ -39,7 +39,7 @@ public class UniformContinuousDistribution extends
AbstractContinuousDistributio
public UniformContinuousDistribution(double lower,
double upper) {
if (lower >= upper) {
- throw new DistributionException(DistributionException.TOO_LARGE,
+ throw new
DistributionException(DistributionException.INVALID_RANGE_LOW_GTE_HIGH,
lower, upper);
}
diff --git
a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformDiscreteDistribution.java
b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformDiscreteDistribution.java
index 922aac0..959ee2f 100644
---
a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformDiscreteDistribution.java
+++
b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformDiscreteDistribution.java
@@ -47,7 +47,7 @@ public class UniformDiscreteDistribution extends
AbstractDiscreteDistribution {
public UniformDiscreteDistribution(int lower,
int upper) {
if (lower > upper) {
- throw new DistributionException(DistributionException.TOO_LARGE,
+ throw new
DistributionException(DistributionException.INVALID_RANGE_LOW_GT_HIGH,
lower, upper);
}
this.lower = lower;
