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:56 UTC
[commons-math] branch master updated (715d89d -> ba8a267)
This is an automated email from the ASF dual-hosted git repository.
erans pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-math.git.
from 715d89d MATH-1537: Clean-up.
new 6af45f8 clean-up in tests
new 5a8145a Formatting (unit test).
new ba8a267 Use "addAll" instead of loop.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../commons/math4/exception/util/ArgUtils.java | 5 +-
.../commons/math4/ode/AbstractParameterizable.java | 9 +-
.../math4/ode/ContinuousOutputFieldModel.java | 4 +-
.../math4/optim/linear/LinearConstraintSet.java | 5 +-
.../java/org/apache/commons/math4/dfp/DfpTest.java | 118 +++++++++------------
.../ml/neuralnet/sofm/KohonenTrainingTaskTest.java | 5 +-
.../neuralnet/sofm/TravellingSalesmanSolver.java | 5 +-
7 files changed, 64 insertions(+), 87 deletions(-)
[commons-math] 02/03: Formatting (unit test).
Posted by er...@apache.org.
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 5a8145a9df90568a603258c8206a070d3049f1e6
Author: Gilles Sadowski <gi...@gmail.com>
AuthorDate: Sat Jun 6 12:02:09 2020 +0200
Formatting (unit test).
Closes #140.
---
.../java/org/apache/commons/math4/dfp/DfpTest.java | 81 ++++++++--------------
1 file changed, 29 insertions(+), 52 deletions(-)
diff --git a/src/test/java/org/apache/commons/math4/dfp/DfpTest.java b/src/test/java/org/apache/commons/math4/dfp/DfpTest.java
index 1c67a76..b6848c8 100644
--- a/src/test/java/org/apache/commons/math4/dfp/DfpTest.java
+++ b/src/test/java/org/apache/commons/math4/dfp/DfpTest.java
@@ -64,8 +64,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
// Generic test function. Takes params x and y and tests them for
// equality. Then checks the status flags against the flags argument.
// If the test fail, it prints the desc string
- private void test(Dfp x, Dfp y, int flags, String desc)
- {
+ private void test(Dfp x, Dfp y, int flags, String desc) {
boolean b = x.equals(y);
if (!x.equals(y) && !x.unequal(y)) // NaNs involved
@@ -117,8 +116,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
* Test addition
*/
@Test
- public void testAdd()
- {
+ public void testAdd() {
test(field.newDfp("1").add(field.newDfp("1")), // Basic tests 1+1 = 2
field.newDfp("2"),
0, "Add #1");
@@ -371,36 +369,34 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
// Test comparisons
// utility function to help test comparisons
- private void cmptst(Dfp a, Dfp b, String op, boolean result, double num)
- {
+ private void cmptst(Dfp a, Dfp b, String op, boolean result, double num) {
if (op == "equal") {
if (a.equals(b) != result) {
- assertionFailOpNum(op,num);
+ assertionFailOpNum(op, num);
}
}
if (op == "unequal") {
if (a.unequal(b) != result) {
- assertionFailOpNum(op,num);
+ assertionFailOpNum(op, num);
}
}
if (op == "lessThan") {
if (a.lessThan(b) != result) {
- assertionFailOpNum(op,num);
+ assertionFailOpNum(op, num);
}
}
if (op == "greaterThan") {
if (a.greaterThan(b) != result) {
- assertionFailOpNum(op,num);
+ assertionFailOpNum(op, num);
}
}
}
@Test
- public void testCompare()
- {
+ public void testCompare() {
// test equal() comparison
// check zero vs. zero
field.clearIEEEFlags();
@@ -782,8 +778,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
// Test multiplication
//
@Test
- public void testMultiply()
- {
+ public void testMultiply() {
test(field.newDfp("1").multiply(field.newDfp("1")), // Basic tests 1*1 = 1
field.newDfp("1"),
0, "Multiply #1");
@@ -949,8 +944,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
}
@Test
- public void testDivide()
- {
+ public void testDivide() {
test(field.newDfp("1").divide(nan), // divide by NaN = NaN
nan,
0, "Divide #1");
@@ -1069,8 +1063,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
}
@Test
- public void testReciprocal()
- {
+ public void testReciprocal() {
test(nan.reciprocal(),
nan,
0, "Reciprocal #1");
@@ -1109,8 +1102,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
}
@Test
- public void testDivideInt()
- {
+ public void testDivideInt() {
test(nan.divide(1), // NaN / number = NaN
nan,
0, "DivideInt #1");
@@ -1177,8 +1169,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
}
@Test
- public void testNextAfter()
- {
+ public void testNextAfter() {
test(field.newDfp("1").nextAfter(pinf),
field.newDfp("1.0000000000000001"),
0, "NextAfter #1");
@@ -1241,8 +1232,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
}
@Test
- public void testToString()
- {
+ public void testToString() {
Assert.assertEquals("toString #1", "Infinity", pinf.toString());
Assert.assertEquals("toString #2", "-Infinity", ninf.toString());
Assert.assertEquals("toString #3", "NaN", nan.toString());
@@ -1256,8 +1246,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
@Override
@Test
- public void testRound()
- {
+ public void testRound() {
field.setRoundingMode(DfpField.RoundingMode.ROUND_DOWN);
// Round down
@@ -1376,8 +1365,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
@Override
@Test
- public void testCeil()
- {
+ public void testCeil() {
test(field.newDfp("1234.0000000000000001").ceil(),
field.newDfp("1235"),
DfpField.FLAG_INEXACT, "Ceil #1");
@@ -1385,8 +1373,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
@Override
@Test
- public void testFloor()
- {
+ public void testFloor() {
test(field.newDfp("1234.9999999999999999").floor(),
field.newDfp("1234"),
DfpField.FLAG_INEXACT, "Floor #1");
@@ -1394,8 +1381,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
@Override
@Test
- public void testRint()
- {
+ public void testRint() {
test(field.newDfp("1234.50000000001").rint(),
field.newDfp("1235"),
DfpField.FLAG_INEXACT, "Rint #1");
@@ -1410,8 +1396,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
}
@Test
- public void testCopySign()
- {
+ public void testCopySign() {
test(Dfp.copysign(field.newDfp("1234."), field.newDfp("-1")),
field.newDfp("-1234"),
0, "CopySign #1");
@@ -1430,8 +1415,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
}
@Test
- public void testIntValue()
- {
+ public void testIntValue() {
Assert.assertEquals("intValue #1", 1234, field.newDfp("1234").intValue());
Assert.assertEquals("intValue #2", -1234, field.newDfp("-1234").intValue());
Assert.assertEquals("intValue #3", 1234, field.newDfp("1234.5").intValue());
@@ -1441,8 +1425,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
}
@Test
- public void testLog10K()
- {
+ public void testLog10K() {
Assert.assertEquals("log10K #1", 1, field.newDfp("123456").log10K());
Assert.assertEquals("log10K #2", 2, field.newDfp("123456789").log10K());
Assert.assertEquals("log10K #3", 0, field.newDfp("2").log10K());
@@ -1451,8 +1434,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
}
@Test
- public void testPower10K()
- {
+ public void testPower10K() {
Dfp d = field.newDfp();
test(d.power10K(0), field.newDfp("1"), 0, "Power10 #1");
@@ -1465,9 +1447,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
}
@Test
- public void testLog10()
- {
-
+ public void testLog10() {
Assert.assertEquals("log10 #1", 1, field.newDfp("12").intLog10());
Assert.assertEquals("log10 #2", 2, field.newDfp("123").intLog10());
Assert.assertEquals("log10 #3", 3, field.newDfp("1234").intLog10());
@@ -1488,8 +1468,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
}
@Test
- public void testPower10()
- {
+ public void testPower10() {
Dfp d = field.newDfp();
test(d.power10(0), field.newDfp("1"), 0, "Power10 #1");
@@ -1516,8 +1495,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
}
@Test
- public void testRemainder()
- {
+ public void testRemainder() {
test(field.newDfp("10").remainder(field.newDfp("3")),
field.newDfp("1"),
DfpField.FLAG_INEXACT, "Remainder #1");
@@ -1533,8 +1511,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
@Override
@Test
- public void testSqrt()
- {
+ public void testSqrt() {
test(field.newDfp("0").sqrt(),
field.newDfp("0"),
0, "Sqrt #1");
@@ -1684,14 +1661,14 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
}
private static void assertionFail(String content){
- Assert.fail("assertion failed. " + content);
+ Assert.fail("assertion failed: " + content);
}
private static void assertionFailOpNum(String op, double num){
- assertionFail("" + op + " compare #" + num);
+ assertionFail(op + " compare #" + num);
}
private static final void assertionFailDfpField(DfpField field){
- assertionFail("compare flags = "+field.getIEEEFlags());
+ assertionFail("compare flags = " + field.getIEEEFlags());
}
}
[commons-math] 01/03: clean-up in tests
Posted by er...@apache.org.
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 6af45f83ce35b61ce6c9beaa23daa217f17ea811
Author: XenoAmess <xe...@gmail.com>
AuthorDate: Thu Jun 4 23:10:32 2020 +0800
clean-up in tests
---
.../java/org/apache/commons/math4/dfp/DfpTest.java | 51 +++++++++++++---------
1 file changed, 30 insertions(+), 21 deletions(-)
diff --git a/src/test/java/org/apache/commons/math4/dfp/DfpTest.java b/src/test/java/org/apache/commons/math4/dfp/DfpTest.java
index 63f59ac..1c67a76 100644
--- a/src/test/java/org/apache/commons/math4/dfp/DfpTest.java
+++ b/src/test/java/org/apache/commons/math4/dfp/DfpTest.java
@@ -18,8 +18,6 @@
package org.apache.commons.math4.dfp;
import org.apache.commons.math4.ExtendedFieldElementAbstractTest;
-import org.apache.commons.math4.dfp.Dfp;
-import org.apache.commons.math4.dfp.DfpField;
import org.apache.commons.math4.util.FastMath;
import org.apache.commons.numbers.core.Precision;
import org.junit.After;
@@ -377,25 +375,25 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
{
if (op == "equal") {
if (a.equals(b) != result) {
- Assert.fail("assertion failed. "+op+" compare #"+num);
+ assertionFailOpNum(op,num);
}
}
if (op == "unequal") {
if (a.unequal(b) != result) {
- Assert.fail("assertion failed. "+op+" compare #"+num);
+ assertionFailOpNum(op,num);
}
}
if (op == "lessThan") {
if (a.lessThan(b) != result) {
- Assert.fail("assertion failed. "+op+" compare #"+num);
+ assertionFailOpNum(op,num);
}
}
if (op == "greaterThan") {
if (a.greaterThan(b) != result) {
- Assert.fail("assertion failed. "+op+" compare #"+num);
+ assertionFailOpNum(op,num);
}
}
}
@@ -421,14 +419,14 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
cmptst(field.newDfp("0"), field.newDfp("1e-131072"), "equal", false, 9); // 0 == 1e-131072
// check flags
if (field.getIEEEFlags() != 0) {
- Assert.fail("assertion failed. compare flags = "+field.getIEEEFlags());
+ assertionFailDfpField(field);
}
cmptst(field.newDfp("0"), field.newDfp("1e-131078"), "equal", false, 10); // 0 == 1e-131078
// check flags -- underflow should be set
if (field.getIEEEFlags() != DfpField.FLAG_UNDERFLOW) {
- Assert.fail("assertion failed. compare flags = "+field.getIEEEFlags());
+ assertionFailDfpField(field);
}
field.clearIEEEFlags();
@@ -460,7 +458,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
// 100000 == 1.0000000000000001
cmptst(field.newDfp("1e20"), field.newDfp("1.0000000000000001"), "equal", false, 24);
if (field.getIEEEFlags() != 0) {
- Assert.fail("assertion failed. compare flags = "+field.getIEEEFlags());
+ assertionFailDfpField(field);
}
cmptst(field.newDfp("0.000001"), field.newDfp("1e-6"), "equal", true, 25);
@@ -512,14 +510,14 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
cmptst(field.newDfp("0"), field.newDfp("1e-131072"), "unequal", true, 9); // 0 == 1e-131072
// check flags
if (field.getIEEEFlags() != 0) {
- Assert.fail("assertion failed. compare flags = "+field.getIEEEFlags());
+ assertionFailDfpField(field);
}
cmptst(field.newDfp("0"), field.newDfp("1e-131078"), "unequal", true, 10); // 0 == 1e-131078
// check flags -- underflow should be set
if (field.getIEEEFlags() != DfpField.FLAG_UNDERFLOW) {
- Assert.fail("assertion failed. compare flags = "+field.getIEEEFlags());
+ assertionFailDfpField(field);
}
field.clearIEEEFlags();
@@ -551,7 +549,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
// 100000 == 1.0000000000000001
cmptst(field.newDfp("1e20"), field.newDfp("1.0000000000000001"), "unequal", true, 24);
if (field.getIEEEFlags() != 0) {
- Assert.fail("assertion failed. compare flags = "+field.getIEEEFlags());
+ assertionFailDfpField(field);
}
cmptst(field.newDfp("0.000001"), field.newDfp("1e-6"), "unequal", false, 25);
@@ -586,7 +584,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
cmptst(qnan.negate(), qnan, "unequal", false, 52);
if (field.getIEEEFlags() != 0) {
- Assert.fail("assertion failed. compare unequal flags = "+field.getIEEEFlags());
+ assertionFail("compare unequal flags = "+field.getIEEEFlags());
}
//
@@ -607,14 +605,14 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
cmptst(field.newDfp("0"), field.newDfp("1e-131072"), "lessThan", true, 9); // 0 < 1e-131072
// check flags
if (field.getIEEEFlags() != 0) {
- Assert.fail("assertion failed. compare flags = "+field.getIEEEFlags());
+ assertionFailDfpField(field);
}
cmptst(field.newDfp("0"), field.newDfp("1e-131078"), "lessThan", true, 10); // 0 < 1e-131078
// check flags -- underflow should be set
if (field.getIEEEFlags() != DfpField.FLAG_UNDERFLOW) {
- Assert.fail("assertion failed. compare flags = "+field.getIEEEFlags());
+ assertionFailDfpField(field);
}
field.clearIEEEFlags();
@@ -645,7 +643,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
// 100000 < 1.0000000000000001
cmptst(field.newDfp("1e20"), field.newDfp("1.0000000000000001"), "lessThan", false, 24);
if (field.getIEEEFlags() != 0) {
- Assert.fail("assertion failed. compare flags = "+field.getIEEEFlags());
+ assertionFailDfpField(field);
}
cmptst(field.newDfp("0.000001"), field.newDfp("1e-6"), "lessThan", false, 25);
@@ -680,7 +678,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
//lessThan compares with nans should raise FLAG_INVALID
if (field.getIEEEFlags() != DfpField.FLAG_INVALID) {
- Assert.fail("assertion failed. compare lessThan flags = "+field.getIEEEFlags());
+ assertionFail("compare lessThan flags = "+field.getIEEEFlags());
}
field.clearIEEEFlags();
@@ -702,14 +700,14 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
cmptst(field.newDfp("0"), field.newDfp("1e-131072"), "greaterThan", false, 9); // 0 > 1e-131072
// check flags
if (field.getIEEEFlags() != 0) {
- Assert.fail("assertion failed. compare flags = "+field.getIEEEFlags());
+ assertionFailDfpField(field);
}
cmptst(field.newDfp("0"), field.newDfp("1e-131078"), "greaterThan", false, 10); // 0 > 1e-131078
// check flags -- underflow should be set
if (field.getIEEEFlags() != DfpField.FLAG_UNDERFLOW) {
- Assert.fail("assertion failed. compare flags = "+field.getIEEEFlags());
+ assertionFailDfpField(field);
}
field.clearIEEEFlags();
@@ -740,7 +738,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
// 100000 > 1.0000000000000001
cmptst(field.newDfp("1e20"), field.newDfp("1.0000000000000001"), "greaterThan", true, 24);
if (field.getIEEEFlags() != 0) {
- Assert.fail("assertion failed. compare flags = "+field.getIEEEFlags());
+ assertionFailDfpField(field);
}
cmptst(field.newDfp("0.000001"), field.newDfp("1e-6"), "greaterThan", false, 25);
@@ -775,7 +773,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
//greaterThan compares with nans should raise FLAG_INVALID
if (field.getIEEEFlags() != DfpField.FLAG_INVALID) {
- Assert.fail("assertion failed. compare greaterThan flags = "+field.getIEEEFlags());
+ assertionFail("compare greaterThan flags = "+field.getIEEEFlags());
}
field.clearIEEEFlags();
}
@@ -1685,4 +1683,15 @@ public class DfpTest extends ExtendedFieldElementAbstractTest<Dfp> {
Assert.assertTrue(var5.equals(var6) ? var5.hashCode() == var6.hashCode() : true);
}
+ private static void assertionFail(String content){
+ Assert.fail("assertion failed. " + content);
+ }
+
+ private static void assertionFailOpNum(String op, double num){
+ assertionFail("" + op + " compare #" + num);
+ }
+
+ private static final void assertionFailDfpField(DfpField field){
+ assertionFail("compare flags = "+field.getIEEEFlags());
+ }
}
[commons-math] 03/03: Use "addAll" instead of loop.
Posted by er...@apache.org.
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();