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 23d17c1a846c036f403e8ce21c890227dc29660a Author: aherbert <aherb...@apache.org> AuthorDate: Tue Jul 20 14:01:47 2021 +0100 Remove unnecessarily nested statements --- .../distribution/GeometricDistribution.java | 9 +++------ .../statistics/distribution/LaplaceDistribution.java | 6 ++---- .../statistics/distribution/TDistribution.java | 20 +++++++++----------- 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/GeometricDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/GeometricDistribution.java index ad87994..d9e88cc 100644 --- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/GeometricDistribution.java +++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/GeometricDistribution.java @@ -57,9 +57,8 @@ public class GeometricDistribution extends AbstractDiscreteDistribution { public double probability(int x) { if (x < 0) { return 0.0; - } else { - return Math.exp(log1mProbabilityOfSuccess * x) * probabilityOfSuccess; } + return Math.exp(log1mProbabilityOfSuccess * x) * probabilityOfSuccess; } /** {@inheritDoc} */ @@ -67,9 +66,8 @@ public class GeometricDistribution extends AbstractDiscreteDistribution { public double logProbability(int x) { if (x < 0) { return Double.NEGATIVE_INFINITY; - } else { - return x * log1mProbabilityOfSuccess + logProbabilityOfSuccess; } + return x * log1mProbabilityOfSuccess + logProbabilityOfSuccess; } /** {@inheritDoc} */ @@ -77,9 +75,8 @@ public class GeometricDistribution extends AbstractDiscreteDistribution { public double cumulativeProbability(int x) { if (x < 0) { return 0.0; - } else { - return -Math.expm1(log1mProbabilityOfSuccess * (x + 1)); } + return -Math.expm1(log1mProbabilityOfSuccess * (x + 1)); } /** diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LaplaceDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LaplaceDistribution.java index ef3c76c..f6deeae 100644 --- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LaplaceDistribution.java +++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LaplaceDistribution.java @@ -73,9 +73,8 @@ public class LaplaceDistribution extends AbstractContinuousDistribution { public double cumulativeProbability(double x) { if (x <= mu) { return Math.exp((x - mu) / beta) / 2.0; - } else { - return 1.0 - Math.exp((mu - x) / beta) / 2.0; } + return 1.0 - Math.exp((mu - x) / beta) / 2.0; } /** {@inheritDoc} */ @@ -83,9 +82,8 @@ public class LaplaceDistribution extends AbstractContinuousDistribution { public double survivalProbability(double x) { if (x <= mu) { return 1.0 - Math.exp((x - mu) / beta) / 2.0; - } else { - return Math.exp((mu - x) / beta) / 2.0; } + return Math.exp((mu - x) / beta) / 2.0; } /** {@inheritDoc} */ diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/TDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/TDistribution.java index f1f90a8..6373f58 100644 --- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/TDistribution.java +++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/TDistribution.java @@ -98,18 +98,16 @@ public class TDistribution extends AbstractContinuousDistribution { public double cumulativeProbability(double x) { if (x == 0) { return 0.5; - } else { - if (degreesOfFreedom > DOF_THRESHOLD_NORMAL) { - return 0.5 * (1 + Erf.value(x * ONE_OVER_SQRT_TWO)); - } else { - final double a = 1 / (1 + x * x / degreesOfFreedom); - final double t = RegularizedBeta.value(a, dofOver2, 0.5); - - return x < 0 ? - 0.5 * t : - 1 - 0.5 * t; - } } + if (degreesOfFreedom > DOF_THRESHOLD_NORMAL) { + return 0.5 * (1 + Erf.value(x * ONE_OVER_SQRT_TWO)); + } + final double a = 1 / (1 + x * x / degreesOfFreedom); + final double t = RegularizedBeta.value(a, dofOver2, 0.5); + + return x < 0 ? + 0.5 * t : + 1 - 0.5 * t; } /** {@inheritDoc} */