You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by er...@apache.org on 2020/06/06 10:53:59 UTC
[commons-math] 03/03: Use "addAll" instead of loop.
This is an automated email from the ASF dual-hosted git repository.
erans pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-math.git
commit ba8a26705e7656201951ddc1a4a67c6aaa62d146
Author: XenoAmess <xe...@gmail.com>
AuthorDate: Fri Jun 5 04:14:38 2020 +0800
Use "addAll" instead of loop.
Closes #141.
---
.../java/org/apache/commons/math4/exception/util/ArgUtils.java | 5 ++---
.../org/apache/commons/math4/ode/AbstractParameterizable.java | 9 +++------
.../org/apache/commons/math4/ode/ContinuousOutputFieldModel.java | 4 +---
.../apache/commons/math4/optim/linear/LinearConstraintSet.java | 5 ++---
.../commons/math4/ml/neuralnet/sofm/KohonenTrainingTaskTest.java | 5 ++---
.../math4/ml/neuralnet/sofm/TravellingSalesmanSolver.java | 5 ++---
6 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/src/main/java/org/apache/commons/math4/exception/util/ArgUtils.java b/src/main/java/org/apache/commons/math4/exception/util/ArgUtils.java
index 6e447a0..e5a6a56 100644
--- a/src/main/java/org/apache/commons/math4/exception/util/ArgUtils.java
+++ b/src/main/java/org/apache/commons/math4/exception/util/ArgUtils.java
@@ -16,6 +16,7 @@
*/
package org.apache.commons.math4.exception.util;
+import java.util.Arrays;
import java.util.List;
import java.util.ArrayList;
@@ -42,9 +43,7 @@ public class ArgUtils {
if (array != null) {
for (Object o : array) {
if (o instanceof Object[]) {
- for (Object oR : flatten((Object[]) o)) {
- list.add(oR);
- }
+ list.addAll(Arrays.asList(flatten((Object[]) o)));
} else {
list.add(o);
}
diff --git a/src/main/java/org/apache/commons/math4/ode/AbstractParameterizable.java b/src/main/java/org/apache/commons/math4/ode/AbstractParameterizable.java
index c21365d..139ea7a 100644
--- a/src/main/java/org/apache/commons/math4/ode/AbstractParameterizable.java
+++ b/src/main/java/org/apache/commons/math4/ode/AbstractParameterizable.java
@@ -17,6 +17,7 @@
package org.apache.commons.math4.ode;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
/** This abstract class provides boilerplate parameters list.
@@ -33,18 +34,14 @@ public abstract class AbstractParameterizable implements Parameterizable {
* @param names names of the supported parameters
*/
protected AbstractParameterizable(final String ... names) {
- parametersNames = new ArrayList<>();
- for (final String name : names) {
- parametersNames.add(name);
- }
+ parametersNames = new ArrayList<>(Arrays.asList(names));
}
/** Simple constructor.
* @param names names of the supported parameters
*/
protected AbstractParameterizable(final Collection<String> names) {
- parametersNames = new ArrayList<>();
- parametersNames.addAll(names);
+ parametersNames = new ArrayList<>(names);
}
/** {@inheritDoc} */
diff --git a/src/main/java/org/apache/commons/math4/ode/ContinuousOutputFieldModel.java b/src/main/java/org/apache/commons/math4/ode/ContinuousOutputFieldModel.java
index c933b82..c2caecd 100644
--- a/src/main/java/org/apache/commons/math4/ode/ContinuousOutputFieldModel.java
+++ b/src/main/java/org/apache/commons/math4/ode/ContinuousOutputFieldModel.java
@@ -154,9 +154,7 @@ public class ContinuousOutputFieldModel<T extends RealFieldElement<T>>
}
- for (FieldStepInterpolator<T> interpolator : model.steps) {
- steps.add(interpolator);
- }
+ steps.addAll(model.steps);
index = steps.size() - 1;
finalTime = (steps.get(index)).getCurrentState().getTime();
diff --git a/src/main/java/org/apache/commons/math4/optim/linear/LinearConstraintSet.java b/src/main/java/org/apache/commons/math4/optim/linear/LinearConstraintSet.java
index 3dcc2a1..3ff5da5 100644
--- a/src/main/java/org/apache/commons/math4/optim/linear/LinearConstraintSet.java
+++ b/src/main/java/org/apache/commons/math4/optim/linear/LinearConstraintSet.java
@@ -16,6 +16,7 @@
*/
package org.apache.commons.math4.optim.linear;
+import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.Collection;
@@ -38,9 +39,7 @@ public class LinearConstraintSet implements OptimizationData {
* @param constraints Constraints.
*/
public LinearConstraintSet(LinearConstraint... constraints) {
- for (LinearConstraint c : constraints) {
- linearConstraints.add(c);
- }
+ linearConstraints.addAll(Arrays.asList(constraints));
}
/**
diff --git a/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenTrainingTaskTest.java b/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenTrainingTaskTest.java
index 9fe11ca..9e4ea0f 100644
--- a/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenTrainingTaskTest.java
+++ b/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenTrainingTaskTest.java
@@ -19,6 +19,7 @@ package org.apache.commons.math4.ml.neuralnet.sofm;
import java.io.PrintWriter;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
@@ -166,9 +167,7 @@ public class KohonenTrainingTaskTest {
*/
private Collection<City> uniqueCities(City[] cityList) {
final Set<City> unique = new HashSet<>();
- for (City c : cityList) {
- unique.add(c);
- }
+ unique.addAll(Arrays.asList(cityList));
return unique;
}
diff --git a/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/TravellingSalesmanSolver.java b/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/TravellingSalesmanSolver.java
index c2fc0fe..31379ba 100644
--- a/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/TravellingSalesmanSolver.java
+++ b/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/TravellingSalesmanSolver.java
@@ -17,6 +17,7 @@
package org.apache.commons.math4.ml.neuralnet.sofm;
+import java.util.Arrays;
import java.util.List;
import java.util.ArrayList;
import java.util.Set;
@@ -87,9 +88,7 @@ public class TravellingSalesmanSolver {
random = RandomSource.create(RandomSource.WELL_1024_A, seed);
// Make sure that each city will appear only once in the list.
- for (City city : cityList) {
- cities.add(city);
- }
+ cities.addAll(Arrays.asList(cityList));
// Total number of neurons.
numberOfNeurons = (int) numNeuronsPerCity * cities.size();