[02/10] [math] Remove redundant type arguments.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/762eb53f/src/test/java/org/apache/commons/math4/ode/nonstiff/AbstractRungeKuttaFieldIntegratorTest.java -- diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/AbstractRungeKuttaFieldIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/AbstractRungeKuttaFieldIntegratorTest.java index d79a19f..80b6828 100644 --- a/src/test/java/org/apache/commons/math4/ode/nonstiff/AbstractRungeKuttaFieldIntegratorTest.java +++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/AbstractRungeKuttaFieldIntegratorTest.java @@ -151,8 +151,8 @@ public abstract class AbstractRungeKuttaFieldIntegratorTest { y0[i] = field.getOne().add(i); } -FieldODEStateAndDerivative result = integrator.integrate(new FieldExpandableODE(ode), -new FieldODEState(t0, y0), +FieldODEStateAndDerivative result = integrator.integrate(new FieldExpandableODE<>(ode), +new FieldODEState<>(t0, y0), tEvent); Assert.assertEquals(tEvent.getReal(), result.getTime().getReal(), epsilonT); T[] y = result.getState(); @@ -180,8 +180,8 @@ public abstract class AbstractRungeKuttaFieldIntegratorTest { return Action.CONTINUE; } }, Double.POSITIVE_INFINITY, 1.0e-20, 100); -result = integrator.integrate(new FieldExpandableODE(ode), - new FieldODEState(t0, y0), +result = integrator.integrate(new FieldExpandableODE<>(ode), + new FieldODEState<>(t0, y0), tEvent.add(120)); Assert.assertEquals(tEvent.add(120).getReal(), result.getTime().getReal(), epsilonT); y = result.getState(); @@ -201,17 +201,17 @@ public abstract class AbstractRungeKuttaFieldIntegratorTest { MaxCountExceededException, NoBracketingException { RungeKuttaFieldIntegrator integrator = createIntegrator(field, field.getZero().add(0.01)); try { -TestFieldProblem1 pb = new TestFieldProblem1(field); -integrator.integrate(new FieldExpandableODE(pb), - new FieldODEState(field.getZero(), MathArrays.buildArray(field, pb.getDimension() + 10)), +TestFieldProblem1 pb = new TestFieldProblem1<>(field); +integrator.integrate(new FieldExpandableODE<>(pb), + new FieldODEState<>(field.getZero(), MathArrays.buildArray(field, pb.getDimension() + 10)), field.getOne()); Assert.fail("an exception should have been thrown"); } catch(DimensionMismatchException ie) { } try { -TestFieldProblem1 pb = new TestFieldProblem1(field); -integrator.integrate(new FieldExpandableODE(pb), - new FieldODEState(field.getZero(), MathArrays.buildArray(field, pb.getDimension())), +TestFieldProblem1 pb = new TestFieldProblem1<>(field); +integrator.integrate(new FieldExpandableODE<>(pb), + new FieldODEState<>(field.getZero(), MathArrays.buildArray(field, pb.getDimension())), field.getZero()); Assert.fail("an exception should have been thrown"); } catch(NumberIsTooSmallException ie) { @@ -231,12 +231,12 @@ public abstract class AbstractRungeKuttaFieldIntegratorTest { @SuppressWarnings("unchecked") TestFieldProblemAbstract[] allProblems = (TestFieldProblemAbstract[]) Array.newInstance(TestFieldProblemAbstract.class, 6); -allProblems[0] = new TestFieldProblem1(field); -allProblems[1] = new TestFieldProblem2(field); -allProblems[2] = new TestFieldProblem3(field); -allProblems[3] = new TestFieldProblem4(field); -allProblems[4] = new TestFieldProblem5(field); -allProblems[5] = new TestFieldProblem6(field); +allProblems[0] = new TestFieldProblem1<>(field); +allProblems[1] = new TestFieldProblem2<>(field); +allProblems[2] = new TestFieldProblem3<>(field); +allProblems[3] = new TestFieldProblem4<>(field); +allProblems[4] = new TestFieldProblem5<>(field); +allProblems[5] = new TestFieldProblem6<>(field); for (TestFieldProblemAbstract pb : allProblems) { T previousValueError = null; @@ -246,7 +246,7 @@ public abstract class AbstractRungeKuttaFieldIntegratorTest { T step = pb.getFinalTime().subtract(pb.getInitialState().getTime()).multiply(FastMath.pow(2.0, -i));
[02/10] [math] Remove redundant type arguments.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8b5f4535/src/test/java/org/apache/commons/math4/ode/nonstiff/AbstractRungeKuttaFieldIntegratorTest.java -- diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/AbstractRungeKuttaFieldIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/AbstractRungeKuttaFieldIntegratorTest.java index d79a19f..80b6828 100644 --- a/src/test/java/org/apache/commons/math4/ode/nonstiff/AbstractRungeKuttaFieldIntegratorTest.java +++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/AbstractRungeKuttaFieldIntegratorTest.java @@ -151,8 +151,8 @@ public abstract class AbstractRungeKuttaFieldIntegratorTest { y0[i] = field.getOne().add(i); } -FieldODEStateAndDerivative result = integrator.integrate(new FieldExpandableODE(ode), -new FieldODEState(t0, y0), +FieldODEStateAndDerivative result = integrator.integrate(new FieldExpandableODE<>(ode), +new FieldODEState<>(t0, y0), tEvent); Assert.assertEquals(tEvent.getReal(), result.getTime().getReal(), epsilonT); T[] y = result.getState(); @@ -180,8 +180,8 @@ public abstract class AbstractRungeKuttaFieldIntegratorTest { return Action.CONTINUE; } }, Double.POSITIVE_INFINITY, 1.0e-20, 100); -result = integrator.integrate(new FieldExpandableODE(ode), - new FieldODEState(t0, y0), +result = integrator.integrate(new FieldExpandableODE<>(ode), + new FieldODEState<>(t0, y0), tEvent.add(120)); Assert.assertEquals(tEvent.add(120).getReal(), result.getTime().getReal(), epsilonT); y = result.getState(); @@ -201,17 +201,17 @@ public abstract class AbstractRungeKuttaFieldIntegratorTest { MaxCountExceededException, NoBracketingException { RungeKuttaFieldIntegrator integrator = createIntegrator(field, field.getZero().add(0.01)); try { -TestFieldProblem1 pb = new TestFieldProblem1(field); -integrator.integrate(new FieldExpandableODE(pb), - new FieldODEState(field.getZero(), MathArrays.buildArray(field, pb.getDimension() + 10)), +TestFieldProblem1 pb = new TestFieldProblem1<>(field); +integrator.integrate(new FieldExpandableODE<>(pb), + new FieldODEState<>(field.getZero(), MathArrays.buildArray(field, pb.getDimension() + 10)), field.getOne()); Assert.fail("an exception should have been thrown"); } catch(DimensionMismatchException ie) { } try { -TestFieldProblem1 pb = new TestFieldProblem1(field); -integrator.integrate(new FieldExpandableODE(pb), - new FieldODEState(field.getZero(), MathArrays.buildArray(field, pb.getDimension())), +TestFieldProblem1 pb = new TestFieldProblem1<>(field); +integrator.integrate(new FieldExpandableODE<>(pb), + new FieldODEState<>(field.getZero(), MathArrays.buildArray(field, pb.getDimension())), field.getZero()); Assert.fail("an exception should have been thrown"); } catch(NumberIsTooSmallException ie) { @@ -231,12 +231,12 @@ public abstract class AbstractRungeKuttaFieldIntegratorTest { @SuppressWarnings("unchecked") TestFieldProblemAbstract[] allProblems = (TestFieldProblemAbstract[]) Array.newInstance(TestFieldProblemAbstract.class, 6); -allProblems[0] = new TestFieldProblem1(field); -allProblems[1] = new TestFieldProblem2(field); -allProblems[2] = new TestFieldProblem3(field); -allProblems[3] = new TestFieldProblem4(field); -allProblems[4] = new TestFieldProblem5(field); -allProblems[5] = new TestFieldProblem6(field); +allProblems[0] = new TestFieldProblem1<>(field); +allProblems[1] = new TestFieldProblem2<>(field); +allProblems[2] = new TestFieldProblem3<>(field); +allProblems[3] = new TestFieldProblem4<>(field); +allProblems[4] = new TestFieldProblem5<>(field); +allProblems[5] = new TestFieldProblem6<>(field); for (TestFieldProblemAbstract pb : allProblems) { T previousValueError = null; @@ -246,7 +246,7 @@ public abstract class AbstractRungeKuttaFieldIntegratorTest { T step = pb.getFinalTime().subtract(pb.getInitialState().getTime()).multiply(FastMath.pow(2.0, -i));