From 7d3c3171610582e5c3c3beb57c60652f3d280fe7 Mon Sep 17 00:00:00 2001 From: B Sharma Date: Sat, 6 Jun 2020 20:27:35 +0530 Subject: [PATCH] Replace for with for Each --- .../apache/commons/math4/random/RandomUtils.java | 4 ++-- .../org/apache/commons/math4/stat/StatUtils.java | 4 ++-- .../stat/regression/MillerUpdatingRegression.java | 10 +++++----- .../math4/stat/regression/SimpleRegression.java | 14 +++++++------- .../apache/commons/math4/util/CompositeFormat.java | 4 ++-- .../org/apache/commons/math4/util/MathArrays.java | 6 +++--- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/apache/commons/math4/random/RandomUtils.java b/src/main/java/org/apache/commons/math4/random/RandomUtils.java index 4e9476ac2e..553a2847f7 100644 --- a/src/main/java/org/apache/commons/math4/random/RandomUtils.java +++ b/src/main/java/org/apache/commons/math4/random/RandomUtils.java @@ -260,8 +260,8 @@ public String nextHexString(int len, final byte[] hash = alg.digest(); // Loop over the hash, converting each byte to 2 hex digits - for (int i = 0; i < hash.length; i++) { - final Integer c = Integer.valueOf(hash[i]); + for (byte hash1 : hash) { + final Integer c = Integer.valueOf(hash1); // Add 128 to byte value to make interval 0-255. // This guarantees <= 2 hex digits from "toHexString". diff --git a/src/main/java/org/apache/commons/math4/stat/StatUtils.java b/src/main/java/org/apache/commons/math4/stat/StatUtils.java index 0ab56c7dde..57d225bf13 100644 --- a/src/main/java/org/apache/commons/math4/stat/StatUtils.java +++ b/src/main/java/org/apache/commons/math4/stat/StatUtils.java @@ -746,8 +746,8 @@ public static double[] normalize(final double[] sample) { DescriptiveStatistics stats = new DescriptiveStatistics(); // Add the data from the series to stats - for (int i = 0; i < sample.length; i++) { - stats.addValue(sample[i]); + for (double v : sample) { + stats.addValue(v); } // Compute mean and standard deviation diff --git a/src/main/java/org/apache/commons/math4/stat/regression/MillerUpdatingRegression.java b/src/main/java/org/apache/commons/math4/stat/regression/MillerUpdatingRegression.java index c35d629367..05e5e4b5b6 100644 --- a/src/main/java/org/apache/commons/math4/stat/regression/MillerUpdatingRegression.java +++ b/src/main/java/org/apache/commons/math4/stat/regression/MillerUpdatingRegression.java @@ -942,8 +942,8 @@ public RegressionResults regress(int numberOfRegressors) throws ModelSpecificati double[] cov = this.cov(numberOfRegressors); int rnk = 0; - for (int i = 0; i < this.lindep.length; i++) { - if (!this.lindep[i]) { + for (boolean b : this.lindep) { + if (!b) { ++rnk; } } @@ -1034,9 +1034,9 @@ public RegressionResults regress(int[] variablesToInclude) throws ModelSpecifica if (iExclude > 0) { int j = 0; series = new int[variablesToInclude.length - iExclude]; - for (int i = 0; i < variablesToInclude.length; i++) { - if (variablesToInclude[i] > -1) { - series[j] = variablesToInclude[i]; + for (int i1 : variablesToInclude) { + if (i1 > -1) { + series[j] = i1; ++j; } } diff --git a/src/main/java/org/apache/commons/math4/stat/regression/SimpleRegression.java b/src/main/java/org/apache/commons/math4/stat/regression/SimpleRegression.java index 7fc823d3c9..a91d537864 100644 --- a/src/main/java/org/apache/commons/math4/stat/regression/SimpleRegression.java +++ b/src/main/java/org/apache/commons/math4/stat/regression/SimpleRegression.java @@ -256,12 +256,12 @@ public void removeData(final double x,final double y) { * greater than or equal to 2 */ public void addData(final double[][] data) throws ModelSpecificationException { - for (int i = 0; i < data.length; i++) { - if( data[i].length < 2 ){ - throw new ModelSpecificationException(LocalizedFormats.INVALID_REGRESSION_OBSERVATION, - data[i].length, 2); + for (double[] datum : data) { + if (datum.length < 2) { + throw new ModelSpecificationException(LocalizedFormats.INVALID_REGRESSION_OBSERVATION, + datum.length, 2); } - addData(data[i][0], data[i][1]); + addData(datum[0], datum[1]); } } @@ -301,8 +301,8 @@ public void addObservations(final double[][] x,final double[] y) throws ModelSpe (y == null) ? 0 : y.length); } boolean obsOk=true; - for( int i = 0 ; i < x.length; i++){ - if( x[i] == null || x[i].length == 0 ){ + for (double[] x1 : x) { + if (x1 == null || x1.length == 0) { obsOk = false; } } diff --git a/src/main/java/org/apache/commons/math4/util/CompositeFormat.java b/src/main/java/org/apache/commons/math4/util/CompositeFormat.java index 40809baad4..3176fe32ba 100644 --- a/src/main/java/org/apache/commons/math4/util/CompositeFormat.java +++ b/src/main/java/org/apache/commons/math4/util/CompositeFormat.java @@ -148,8 +148,8 @@ public static Number parseNumber(final String source, final NumberFormat format, final double[] special = { Double.NaN, Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY }; - for (int i = 0; i < special.length; ++i) { - number = parseNumber(source, special[i], pos); + for (double v : special) { + number = parseNumber(source, v, pos); if (number != null) { break; } diff --git a/src/main/java/org/apache/commons/math4/util/MathArrays.java b/src/main/java/org/apache/commons/math4/util/MathArrays.java index a7488e2398..e1ecbb523f 100644 --- a/src/main/java/org/apache/commons/math4/util/MathArrays.java +++ b/src/main/java/org/apache/commons/math4/util/MathArrays.java @@ -1244,9 +1244,9 @@ public static double[] concatenate(double[] ...x) { int offset = 0; int curLength = 0; final double[] combined = new double[combinedLength]; - for (int i = 0; i < x.length; i++) { - curLength = x[i].length; - System.arraycopy(x[i], 0, combined, offset, curLength); + for (double[] x1 : x) { + curLength = x1.length; + System.arraycopy(x1, 0, combined, offset, curLength); offset += curLength; } return combined;