Skip to content

Commit a9018b5

Browse files
committed
moved dense output interpolators to own sub package
1 parent c6350fa commit a9018b5

File tree

76 files changed

+247
-151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+247
-151
lines changed

hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/AdamsBashforthFieldIntegrator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.hipparchus.linear.FieldMatrix;
3030
import org.hipparchus.ode.FieldEquationsMapper;
3131
import org.hipparchus.ode.FieldODEStateAndDerivative;
32+
import org.hipparchus.ode.nonstiff.interpolators.AdamsFieldStateInterpolator;
3233
import org.hipparchus.util.FastMath;
3334

3435

hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/AdamsBashforthIntegrator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.hipparchus.linear.RealMatrix;
2323
import org.hipparchus.ode.EquationsMapper;
2424
import org.hipparchus.ode.ODEStateAndDerivative;
25+
import org.hipparchus.ode.nonstiff.interpolators.AdamsStateInterpolator;
2526
import org.hipparchus.util.FastMath;
2627

2728

hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/AdamsFieldIntegrator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.hipparchus.ode.FieldODEStateAndDerivative;
3535
import org.hipparchus.ode.LocalizedODEFormats;
3636
import org.hipparchus.ode.MultistepFieldIntegrator;
37+
import org.hipparchus.ode.nonstiff.interpolators.AdamsFieldStateInterpolator;
3738
import org.hipparchus.util.MathArrays;
3839

3940

hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/AdamsIntegrator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.hipparchus.ode.MultistepIntegrator;
2828
import org.hipparchus.ode.ODEState;
2929
import org.hipparchus.ode.ODEStateAndDerivative;
30+
import org.hipparchus.ode.nonstiff.interpolators.AdamsStateInterpolator;
3031

3132

3233
/** Base class for {@link AdamsBashforthIntegrator Adams-Bashforth} and

hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/AdamsMoultonFieldIntegrator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.hipparchus.ode.FieldEquationsMapper;
3535
import org.hipparchus.ode.FieldODEStateAndDerivative;
3636
import org.hipparchus.ode.LocalizedODEFormats;
37+
import org.hipparchus.ode.nonstiff.interpolators.AdamsFieldStateInterpolator;
3738
import org.hipparchus.util.MathArrays;
3839
import org.hipparchus.util.MathUtils;
3940

hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/AdamsMoultonIntegrator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.hipparchus.ode.EquationsMapper;
2828
import org.hipparchus.ode.LocalizedODEFormats;
2929
import org.hipparchus.ode.ODEStateAndDerivative;
30+
import org.hipparchus.ode.nonstiff.interpolators.AdamsStateInterpolator;
3031
import org.hipparchus.util.FastMath;
3132

3233

hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/ClassicalRungeKuttaFieldIntegrator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.hipparchus.Field;
2727
import org.hipparchus.ode.FieldEquationsMapper;
2828
import org.hipparchus.ode.FieldODEStateAndDerivative;
29+
import org.hipparchus.ode.nonstiff.interpolators.ClassicalRungeKuttaFieldStateInterpolator;
2930
import org.hipparchus.util.MathArrays;
3031

3132
/**
@@ -111,7 +112,7 @@ public T[] getB() {
111112
final FieldODEStateAndDerivative<T> globalPreviousState,
112113
final FieldODEStateAndDerivative<T> globalCurrentState,
113114
final FieldEquationsMapper<T> mapper) {
114-
return new ClassicalRungeKuttaFieldStateInterpolator<T>(getField(), forward, yDotK,
115+
return new ClassicalRungeKuttaFieldStateInterpolator<>(getField(), forward, yDotK,
115116
globalPreviousState, globalCurrentState,
116117
globalPreviousState, globalCurrentState,
117118
mapper);

hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/ClassicalRungeKuttaIntegrator.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import org.hipparchus.ode.EquationsMapper;
2121
import org.hipparchus.ode.ODEStateAndDerivative;
22+
import org.hipparchus.ode.nonstiff.interpolators.ClassicalRungeKuttaStateInterpolator;
2223

2324
/**
2425
* This class implements the classical fourth order Runge-Kutta
@@ -85,15 +86,12 @@ public double[] getB() {
8586

8687
/** {@inheritDoc} */
8788
@Override
88-
protected ClassicalRungeKuttaStateInterpolator
89-
createInterpolator(final boolean forward, double[][] yDotK,
90-
final ODEStateAndDerivative globalPreviousState,
91-
final ODEStateAndDerivative globalCurrentState,
92-
final EquationsMapper mapper) {
93-
return new ClassicalRungeKuttaStateInterpolator(forward, yDotK,
94-
globalPreviousState, globalCurrentState,
95-
globalPreviousState, globalCurrentState,
96-
mapper);
89+
protected ClassicalRungeKuttaStateInterpolator createInterpolator(final boolean forward, final double[][] yDotK,
90+
final ODEStateAndDerivative globalPreviousState,
91+
final ODEStateAndDerivative globalCurrentState,
92+
final EquationsMapper mapper) {
93+
return new ClassicalRungeKuttaStateInterpolator(forward, yDotK, globalPreviousState, globalCurrentState,
94+
globalPreviousState, globalCurrentState, mapper);
9795
}
9896

9997
}

hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/DormandPrince54FieldIntegrator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.hipparchus.Field;
2727
import org.hipparchus.ode.FieldEquationsMapper;
2828
import org.hipparchus.ode.FieldODEStateAndDerivative;
29+
import org.hipparchus.ode.nonstiff.interpolators.DormandPrince54FieldStateInterpolator;
2930
import org.hipparchus.util.FastMath;
3031
import org.hipparchus.util.MathArrays;
3132

@@ -165,7 +166,7 @@ public T[] getB() {
165166
createInterpolator(final boolean forward, T[][] yDotK,
166167
final FieldODEStateAndDerivative<T> globalPreviousState,
167168
final FieldODEStateAndDerivative<T> globalCurrentState, final FieldEquationsMapper<T> mapper) {
168-
return new DormandPrince54FieldStateInterpolator<T>(getField(), forward, yDotK,
169+
return new DormandPrince54FieldStateInterpolator<>(getField(), forward, yDotK,
169170
globalPreviousState, globalCurrentState,
170171
globalPreviousState, globalCurrentState,
171172
mapper);

hipparchus-ode/src/main/java/org/hipparchus/ode/nonstiff/DormandPrince54Integrator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import org.hipparchus.ode.EquationsMapper;
2121
import org.hipparchus.ode.ODEStateAndDerivative;
22+
import org.hipparchus.ode.nonstiff.interpolators.DormandPrince54StateInterpolator;
2223
import org.hipparchus.util.FastMath;
2324

2425

0 commit comments

Comments
 (0)