[07/10] [math] Remove redundant type arguments.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/762eb53f/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsFieldStepInterpolator.java -- diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsFieldStepInterpolator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsFieldStepInterpolator.java index b4b5357..feac005 100644 --- a/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsFieldStepInterpolator.java +++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsFieldStepInterpolator.java @@ -103,7 +103,7 @@ class AdamsFieldStepInterpolator> extends Abstract this.scalingH = stepSize; this.reference = reference; this.scaled= scaled.clone(); -this.nordsieck = new Array2DRowFieldMatrix(nordsieck.getData(), false); +this.nordsieck = new Array2DRowFieldMatrix<>(nordsieck.getData(), false); } /** Create a new instance. @@ -121,7 +121,7 @@ class AdamsFieldStepInterpolator> extends Abstract FieldODEStateAndDerivative newSoftPreviousState, FieldODEStateAndDerivative newSoftCurrentState, FieldEquationsMapper newMapper) { -return new AdamsFieldStepInterpolator(scalingH, reference, scaled, nordsieck, +return new AdamsFieldStepInterpolator<>(scalingH, reference, scaled, nordsieck, newForward, newGlobalPreviousState, newGlobalCurrentState, newSoftPreviousState, newSoftCurrentState, @@ -181,7 +181,7 @@ class AdamsFieldStepInterpolator> extends Abstract estimatedDerivatives[j].add(scaled[j].multiply(normalizedAbscissa)).divide(x); } -return new FieldODEStateAndDerivative(time, estimatedState, estimatedDerivatives); +return new FieldODEStateAndDerivative<>(time, estimatedState, estimatedDerivatives); } http://git-wip-us.apache.org/repos/asf/commons-math/blob/762eb53f/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonFieldIntegrator.java -- diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonFieldIntegrator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonFieldIntegrator.java index c659cc0..72d4de2 100644 --- a/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonFieldIntegrator.java +++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonFieldIntegrator.java @@ -284,8 +284,8 @@ public class AdamsMoultonFieldIntegrator> extends updateHighOrderDerivativesPhase2(predictedScaled, correctedScaled, predictedNordsieck); // discrete events handling -stepEnd = new FieldODEStateAndDerivative(stepEnd.getTime(), predictedY, correctedYDot); -setStepStart(acceptStep(new AdamsFieldStepInterpolator(getStepSize(), stepEnd, +stepEnd = new FieldODEStateAndDerivative<>(stepEnd.getTime(), predictedY, correctedYDot); +setStepStart(acceptStep(new AdamsFieldStepInterpolator<>(getStepSize(), stepEnd, correctedScaled, predictedNordsieck, forward, getStepStart(), stepEnd, equations.getMapper()), http://git-wip-us.apache.org/repos/asf/commons-math/blob/762eb53f/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsNordsieckFieldTransformer.java -- diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsNordsieckFieldTransformer.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsNordsieckFieldTransformer.java index c1e5bee..7c2b872 100644 --- a/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsNordsieckFieldTransformer.java +++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsNordsieckFieldTransformer.java @@ -137,8 +137,7 @@ public class AdamsNordsieckFieldTransformer> { private static final Map, AdamsNordsieckFieldTransformer>>> CACHE = -new HashMap , - AdamsNordsieckFieldTransformer>>>(); +new HashMap<>(); /** Field to which the time and state vector elements belong. */ private final Field field; @@ -162,11 +161,11 @@ public class AdamsNordsieckFieldTransformer> { // compute coefficients FieldMatrix bigP = buildP(rows);
[07/10] [math] Remove redundant type arguments.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8b5f4535/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsFieldStepInterpolator.java -- diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsFieldStepInterpolator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsFieldStepInterpolator.java index b4b5357..feac005 100644 --- a/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsFieldStepInterpolator.java +++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsFieldStepInterpolator.java @@ -103,7 +103,7 @@ class AdamsFieldStepInterpolator> extends Abstract this.scalingH = stepSize; this.reference = reference; this.scaled= scaled.clone(); -this.nordsieck = new Array2DRowFieldMatrix(nordsieck.getData(), false); +this.nordsieck = new Array2DRowFieldMatrix<>(nordsieck.getData(), false); } /** Create a new instance. @@ -121,7 +121,7 @@ class AdamsFieldStepInterpolator> extends Abstract FieldODEStateAndDerivative newSoftPreviousState, FieldODEStateAndDerivative newSoftCurrentState, FieldEquationsMapper newMapper) { -return new AdamsFieldStepInterpolator(scalingH, reference, scaled, nordsieck, +return new AdamsFieldStepInterpolator<>(scalingH, reference, scaled, nordsieck, newForward, newGlobalPreviousState, newGlobalCurrentState, newSoftPreviousState, newSoftCurrentState, @@ -181,7 +181,7 @@ class AdamsFieldStepInterpolator> extends Abstract estimatedDerivatives[j].add(scaled[j].multiply(normalizedAbscissa)).divide(x); } -return new FieldODEStateAndDerivative(time, estimatedState, estimatedDerivatives); +return new FieldODEStateAndDerivative<>(time, estimatedState, estimatedDerivatives); } http://git-wip-us.apache.org/repos/asf/commons-math/blob/8b5f4535/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonFieldIntegrator.java -- diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonFieldIntegrator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonFieldIntegrator.java index c659cc0..72d4de2 100644 --- a/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonFieldIntegrator.java +++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonFieldIntegrator.java @@ -284,8 +284,8 @@ public class AdamsMoultonFieldIntegrator> extends updateHighOrderDerivativesPhase2(predictedScaled, correctedScaled, predictedNordsieck); // discrete events handling -stepEnd = new FieldODEStateAndDerivative(stepEnd.getTime(), predictedY, correctedYDot); -setStepStart(acceptStep(new AdamsFieldStepInterpolator(getStepSize(), stepEnd, +stepEnd = new FieldODEStateAndDerivative<>(stepEnd.getTime(), predictedY, correctedYDot); +setStepStart(acceptStep(new AdamsFieldStepInterpolator<>(getStepSize(), stepEnd, correctedScaled, predictedNordsieck, forward, getStepStart(), stepEnd, equations.getMapper()), http://git-wip-us.apache.org/repos/asf/commons-math/blob/8b5f4535/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsNordsieckFieldTransformer.java -- diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsNordsieckFieldTransformer.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsNordsieckFieldTransformer.java index c1e5bee..7c2b872 100644 --- a/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsNordsieckFieldTransformer.java +++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsNordsieckFieldTransformer.java @@ -137,8 +137,7 @@ public class AdamsNordsieckFieldTransformer> { private static final Map, AdamsNordsieckFieldTransformer>>> CACHE = -new HashMap , - AdamsNordsieckFieldTransformer>>>(); +new HashMap<>(); /** Field to which the time and state vector elements belong. */ private final Field field; @@ -162,11 +161,11 @@ public class AdamsNordsieckFieldTransformer> { // compute coefficients FieldMatrix bigP = buildP(rows);