Skip to content

Commit

Permalink
Use "addAll" instead of loop.
Browse files Browse the repository at this point in the history
Closes #141.
  • Loading branch information
XenoAmess authored and Gilles Sadowski committed Jun 6, 2020
1 parent 5a8145a commit ba8a267
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.apache.commons.math4.exception.util;

import java.util.Arrays;
import java.util.List;
import java.util.ArrayList;

Expand All @@ -42,9 +43,7 @@ public static Object[] flatten(Object[] array) {
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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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} */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,7 @@ public void append(final ContinuousOutputFieldModel<T> model)

}

for (FieldStepInterpolator<T> interpolator : model.steps) {
steps.add(interpolator);
}
steps.addAll(model.steps);

index = steps.size() - 1;
finalTime = (steps.get(index)).getCurrentState().getTime();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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));
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
Expand Down Expand Up @@ -166,9 +167,7 @@ private String travelCoordinatesTable(TravellingSalesmanSolver solver) {
*/
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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -87,9 +88,7 @@ public TravellingSalesmanSolver(City[] cityList,
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();
Expand Down

0 comments on commit ba8a267

Please sign in to comment.