Apache
/
commons-math
mirror of https://github.com/apache/commons-math.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move constant declaration to where it is actually used.

This commit is contained in:
Gilles Sadowski 2021-05-26 03:35:25 +02:00
parent 9087575eec
commit a4c8c52bd2
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/inference/KolmogorovSmirnovTest.java
View File

@ -112,6 +112,8 @@ import org.apache.commons.math4.legacy.field.linalg.FieldDenseMatrix;
* @since 3.3 * @since 3.3
*/ */
public class KolmogorovSmirnovTest { public class KolmogorovSmirnovTest {
/** pi^2. */
private static final double PI_SQUARED = FastMath.PI * FastMath.PI;
/** /**
* Bound on the number of partial sums in {@link #ksSum(double, double, int)} * Bound on the number of partial sums in {@link #ksSum(double, double, int)}
*/ */
@ -556,7 +558,7 @@ public class KolmogorovSmirnovTest {
double sum = 0; double sum = 0;
double increment = 0; double increment = 0;
double kTerm = 0; double kTerm = 0;
double z2Term = MathUtils.PI_SQUARED / (8 * z2); double z2Term = PI_SQUARED / (8 * z2);
int k = 1; int k = 1;
for (; k < MAXIMUM_PARTIAL_SUM_COUNT; k++) { for (; k < MAXIMUM_PARTIAL_SUM_COUNT; k++) {
kTerm = 2 * k - 1; kTerm = 2 * k - 1;
@ -581,7 +583,7 @@ public class KolmogorovSmirnovTest {
for (k = 0; k < MAXIMUM_PARTIAL_SUM_COUNT; k++) { for (k = 0; k < MAXIMUM_PARTIAL_SUM_COUNT; k++) {
kTerm = k + 0.5; kTerm = k + 0.5;
kTerm2 = kTerm * kTerm; kTerm2 = kTerm * kTerm;
increment = (MathUtils.PI_SQUARED * kTerm2 - z2) * FastMath.exp(-MathUtils.PI_SQUARED * kTerm2 / twoZ2); increment = (PI_SQUARED * kTerm2 - z2) * FastMath.exp(-PI_SQUARED * kTerm2 / twoZ2);
sum += increment; sum += increment;
if (FastMath.abs(increment) < PG_SUM_RELATIVE_ERROR * FastMath.abs(sum)) { if (FastMath.abs(increment) < PG_SUM_RELATIVE_ERROR * FastMath.abs(sum)) {
break; break;
@ -599,15 +601,15 @@ public class KolmogorovSmirnovTest {
final double z4Term = 2 * z4; final double z4Term = 2 * z4;
final double z6Term = 6 * z6; final double z6Term = 6 * z6;
z2Term = 5 * z2; z2Term = 5 * z2;
final double pi4 = MathUtils.PI_SQUARED * MathUtils.PI_SQUARED; final double pi4 = PI_SQUARED * PI_SQUARED;
sum = 0; sum = 0;
kTerm = 0; kTerm = 0;
kTerm2 = 0; kTerm2 = 0;
for (k = 0; k < MAXIMUM_PARTIAL_SUM_COUNT; k++) { for (k = 0; k < MAXIMUM_PARTIAL_SUM_COUNT; k++) {
kTerm = k + 0.5; kTerm = k + 0.5;
kTerm2 = kTerm * kTerm; kTerm2 = kTerm * kTerm;
increment = (z6Term + z4Term + MathUtils.PI_SQUARED * (z4Term - z2Term) * kTerm2 + increment = (z6Term + z4Term + PI_SQUARED * (z4Term - z2Term) * kTerm2 +
pi4 * (1 - twoZ2) * kTerm2 * kTerm2) * FastMath.exp(-MathUtils.PI_SQUARED * kTerm2 / twoZ2); pi4 * (1 - twoZ2) * kTerm2 * kTerm2) * FastMath.exp(-PI_SQUARED * kTerm2 / twoZ2);
sum += increment; sum += increment;
if (FastMath.abs(increment) < PG_SUM_RELATIVE_ERROR * FastMath.abs(sum)) { if (FastMath.abs(increment) < PG_SUM_RELATIVE_ERROR * FastMath.abs(sum)) {
break; break;
@ -620,7 +622,7 @@ public class KolmogorovSmirnovTest {
kTerm2 = 0; kTerm2 = 0;
for (k = 1; k < MAXIMUM_PARTIAL_SUM_COUNT; k++) { for (k = 1; k < MAXIMUM_PARTIAL_SUM_COUNT; k++) {
kTerm2 = k * k; kTerm2 = k * k;
increment = MathUtils.PI_SQUARED * kTerm2 * FastMath.exp(-MathUtils.PI_SQUARED * kTerm2 / twoZ2); increment = PI_SQUARED * kTerm2 * FastMath.exp(-PI_SQUARED * kTerm2 / twoZ2);
sum2 += increment; sum2 += increment;
if (FastMath.abs(increment) < PG_SUM_RELATIVE_ERROR * FastMath.abs(sum2)) { if (FastMath.abs(increment) < PG_SUM_RELATIVE_ERROR * FastMath.abs(sum2)) {
break; break;
@ -634,7 +636,7 @@ public class KolmogorovSmirnovTest {
// K_3(z) One more time with feeling - two doubly infinite sums, all k powers even. // K_3(z) One more time with feeling - two doubly infinite sums, all k powers even.
// Multiply coefficient denominators by 2, so omit doubling sums. // Multiply coefficient denominators by 2, so omit doubling sums.
final double pi6 = pi4 * MathUtils.PI_SQUARED; final double pi6 = pi4 * PI_SQUARED;
sum = 0; sum = 0;
double kTerm4 = 0; double kTerm4 = 0;
double kTerm6 = 0; double kTerm6 = 0;
@ -644,8 +646,8 @@ public class KolmogorovSmirnovTest {
kTerm4 = kTerm2 * kTerm2; kTerm4 = kTerm2 * kTerm2;
kTerm6 = kTerm4 * kTerm2; kTerm6 = kTerm4 * kTerm2;
increment = (pi6 * kTerm6 * (5 - 30 * z2) + pi4 * kTerm4 * (-60 * z2 + 212 * z4) + increment = (pi6 * kTerm6 * (5 - 30 * z2) + pi4 * kTerm4 * (-60 * z2 + 212 * z4) +
MathUtils.PI_SQUARED * kTerm2 * (135 * z4 - 96 * z6) - 30 * z6 - 90 * z8) * PI_SQUARED * kTerm2 * (135 * z4 - 96 * z6) - 30 * z6 - 90 * z8) *
FastMath.exp(-MathUtils.PI_SQUARED * kTerm2 / twoZ2); FastMath.exp(-PI_SQUARED * kTerm2 / twoZ2);
sum += increment; sum += increment;
if (FastMath.abs(increment) < PG_SUM_RELATIVE_ERROR * FastMath.abs(sum)) { if (FastMath.abs(increment) < PG_SUM_RELATIVE_ERROR * FastMath.abs(sum)) {
break; break;
@ -658,8 +660,8 @@ public class KolmogorovSmirnovTest {
for (k = 1; k < MAXIMUM_PARTIAL_SUM_COUNT; k++) { for (k = 1; k < MAXIMUM_PARTIAL_SUM_COUNT; k++) {
kTerm2 = k * k; kTerm2 = k * k;
kTerm4 = kTerm2 * kTerm2; kTerm4 = kTerm2 * kTerm2;
increment = (-pi4 * kTerm4 + 3 * MathUtils.PI_SQUARED * kTerm2 * z2) * increment = (-pi4 * kTerm4 + 3 * PI_SQUARED * kTerm2 * z2) *
FastMath.exp(-MathUtils.PI_SQUARED * kTerm2 / twoZ2); FastMath.exp(-PI_SQUARED * kTerm2 / twoZ2);
sum2 += increment; sum2 += increment;
if (FastMath.abs(increment) < PG_SUM_RELATIVE_ERROR * FastMath.abs(sum2)) { if (FastMath.abs(increment) < PG_SUM_RELATIVE_ERROR * FastMath.abs(sum2)) {
break; break;

7
commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/util/MathUtils.java
View File

@ -27,13 +27,6 @@ import org.apache.commons.math4.legacy.exception.util.LocalizedFormats;
* *
*/ */
public final class MathUtils { public final class MathUtils {
/**
* \(\pi^2\)
* @since 3.4
*/
public static final double PI_SQUARED = FastMath.PI * FastMath.PI;
/** /**
* Class contains only static methods. * Class contains only static methods.
*/ */