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 e17836cb1dbae0855691e568b3256f0a1a696a92
Author: Alex Herbert <aherb...@apache.org>
AuthorDate: Mon Mar 24 15:54:32 2025 +0000
Sonar fix: remove use of restricted keyword var
---
.../distribution/NakagamiDistributionTest.java | 2 +-
.../distribution/TrapezoidalDistributionTest.java | 4 ++--
.../distribution/TruncatedNormalDistributionTest.java | 18 +++++++++---------
.../commons/statistics/distribution/UserGuideTest.java | 4 ++--
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NakagamiDistributionTest.java
b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NakagamiDistributionTest.java
index 711cf68..bc1b2ae 100644
---
a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NakagamiDistributionTest.java
+++
b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NakagamiDistributionTest.java
@@ -101,7 +101,7 @@ class NakagamiDistributionTest extends
BaseContinuousDistributionTest {
// #define quad boost::multiprecision::float128
// T v = boost::math::tgamma_delta_ratio(mu, T(0.5));
// T mean = sqrt(omega / mu) / v;
- // T var = omega - (omega / mu) / v / v;
+ // T variance = omega - (omega / mu) / v / v;
"175, 0.75, 0.865407035923572335404337637742305354,
0.00107066217397678136642741884083229635",
"175, 1, 0.999285970298141244170512691211913862,
0.0014275495653023751552365584544430618",
"175, 1.25, 1.11723567927423980521693795242933784,
0.00178443695662796894404569806805382725",
diff --git
a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TrapezoidalDistributionTest.java
b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TrapezoidalDistributionTest.java
index 0d0915c..361a6a8 100644
---
a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TrapezoidalDistributionTest.java
+++
b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TrapezoidalDistributionTest.java
@@ -128,8 +128,8 @@ class TrapezoidalDistributionTest extends
BaseContinuousDistributionTest {
divisor = divisor.multiply(BigDecimal.valueOf(2));
dc = dd.pow(4).subtract(cc.pow(4)).divide(dd.subtract(cc), mc);
ba = bb.pow(4).subtract(aa.pow(4)).divide(bb.subtract(aa), mc);
- final BigDecimal var = dc.subtract(ba).divide(divisor,
mc).subtract(mu.pow(2));
- return Arguments.of(a, b, c, d, mu.doubleValue(), var.doubleValue(),
ulps);
+ final BigDecimal variance = dc.subtract(ba).divide(divisor,
mc).subtract(mu.pow(2));
+ return Arguments.of(a, b, c, d, mu.doubleValue(),
variance.doubleValue(), ulps);
}
/**
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 50d55de..919654e 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
@@ -340,10 +340,10 @@ class TruncatedNormalDistributionTest extends
BaseContinuousDistributionTest {
// Allow small absolute variances using an absolute threshold of
// machine epsilon (2^-52) * 1.5. Any true variance approaching
machine epsilon
// is allowed to be computed as small or zero but cannot be too
large.
- final double var = TruncatedNormalDistribution.variance(lower,
upper);
- Assertions.assertTrue(var >= 0, () -> "Variance is not positive: "
+ var);
- Assertions.assertEquals(var,
TruncatedNormalDistribution.variance(-upper, -lower));
- TestUtils.assertEquals(variance, var,
+ final double v = TruncatedNormalDistribution.variance(lower,
upper);
+ Assertions.assertTrue(v >= 0, () -> "Variance is not positive: " +
v);
+ Assertions.assertEquals(v,
TruncatedNormalDistribution.variance(-upper, -lower));
+ TestUtils.assertEquals(variance, v,
createAbsOrRelTolerance(1.5 * 0x1.0p-52,
-varianceRelativeError),
() -> String.format("variance(%s, %s)", lower, upper));
} else {
@@ -378,9 +378,9 @@ class TruncatedNormalDistributionTest extends
BaseContinuousDistributionTest {
* Assert the variance of the truncated normal distribution is within the
provided relative error.
*/
private static void assertVariance(double lower, double upper, double
expected, double eps) {
- final double var = TruncatedNormalDistribution.variance(lower, upper);
- Assertions.assertEquals(var,
TruncatedNormalDistribution.variance(-upper, -lower));
- TestUtils.assertEquals(expected, var, DoubleTolerances.relative(eps),
+ final double variance = TruncatedNormalDistribution.variance(lower,
upper);
+ Assertions.assertEquals(variance,
TruncatedNormalDistribution.variance(-upper, -lower));
+ TestUtils.assertEquals(expected, variance,
DoubleTolerances.relative(eps),
() -> String.format("variance(%s, %s)", lower, upper));
}
@@ -392,8 +392,8 @@ class TruncatedNormalDistributionTest extends
BaseContinuousDistributionTest {
private static void assertVariance(double lower, double upper, double u,
double s, double expected, double eps) {
final double a = (lower - u) / s;
final double b = (upper - u) / s;
- final double var = TruncatedNormalDistribution.variance(a, b) * s * s;
- TestUtils.assertEquals(expected, var, DoubleTolerances.relative(eps),
+ final double variance = TruncatedNormalDistribution.variance(a, b) * s
* s;
+ TestUtils.assertEquals(expected, variance,
DoubleTolerances.relative(eps),
() -> String.format("variance(%s, %s, %s, %s)", lower, upper, u,
s));
}
}
diff --git
a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UserGuideTest.java
b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UserGuideTest.java
index 6e0ac77..c1bbb98 100644
---
a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UserGuideTest.java
+++
b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UserGuideTest.java
@@ -63,7 +63,7 @@ class UserGuideTest {
ChiSquaredDistribution chi2 = ChiSquaredDistribution.of(42);
double df = chi2.getDegreesOfFreedom(); // 42
double mean = chi2.getMean(); // 42
- double var = chi2.getVariance(); // 84
+ double variance = chi2.getVariance(); // 84
CauchyDistribution cauchy = CauchyDistribution.of(1.23, 4.56);
double location = cauchy.getLocation(); // 1.23
@@ -73,7 +73,7 @@ class UserGuideTest {
Assertions.assertEquals(42, df);
Assertions.assertEquals(42, mean);
- Assertions.assertEquals(84, var);
+ Assertions.assertEquals(84, variance);
Assertions.assertEquals(1.23, location);
Assertions.assertEquals(4.56, scale);
Assertions.assertEquals(Double.NaN, undefined1);
