Skip to content

Commit 24df8ab

Browse files
authored
Merge pull request #373 from Serrof/issue-372
Rename RungeKutta(Field)Integrator
2 parents 301273d + ea3a499 commit 24df8ab

39 files changed

+83
-78
lines changed

hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/FieldGradientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void testStackVariable() {
3333
// THEN
3434
Assertions.assertEquals(gradient.getValue(), gradientWithMoreVariable.getValue());
3535
Assertions.assertEquals(gradient.getFreeParameters() + 1, gradientWithMoreVariable.getFreeParameters());
36-
Assertions.assertEquals(0., gradientWithMoreVariable.getGradient[gradient.getFreeParameters().getReal()]);
36+
Assertions.assertEquals(0., gradientWithMoreVariable.getGradient()[gradient.getFreeParameters()].getReal());
3737
Assertions.assertArrayEquals(gradient.getGradient(), Arrays.copyOfRange(gradientWithMoreVariable.getGradient(),
3838
0, gradient.getFreeParameters()));
3939
}

hipparchus-core/src/test/java/org/hipparchus/analysis/differentiation/GradientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ void testStackVariable() {
103103
// THEN
104104
Assertions.assertEquals(gradient.getValue(), gradientWithMoreVariable.getValue());
105105
Assertions.assertEquals(gradient.getFreeParameters() + 1, gradientWithMoreVariable.getFreeParameters());
106-
Assertions.assertEquals(0., gradientWithMoreVariable.getGradient[gradient.getFreeParameters()]);
106+
Assertions.assertEquals(0., gradientWithMoreVariable.getGradient()[gradient.getFreeParameters()]);
107107
Assertions.assertArrayEquals(gradient.getGradient(), Arrays.copyOfRange(gradientWithMoreVariable.getGradient(),
108108
0, gradient.getFreeParameters()));
109109
}

hipparchus-ode/src/changes/changes.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,20 @@ If the output is not quite correct, check for invisible trailing spaces!
4848
<properties>
4949
<title>Hipparchus ODE Release Notes</title>
5050
</properties>
51-
<release version="4.0" date="TBD" description="TBD">
52-
<action dev="vincent" type="update" issue="issues/285">
53-
Migrated tests from JUnit 4 to JUnit 5
54-
</action>
55-
</release>
5651
<body>
5752
<release version="4.0" date="TBD" description="TBD">
53+
<action dev="serrof" type="update" issue="issues/372">
54+
Rename RungeKutta(Field)Integrator as FixedStepRungeKutta(Field)Integrator.
55+
</action>
5856
<action dev="serrof" type="update" issue="issues/361">
5957
Rename DEFAULT_MAXCHECK as DEFAULT_MAX_CHECK.
6058
</action>
6159
<action dev="serrof" type="add" issue="issues/335">
6260
Add boolean for propagation direction in (Field)AdaptableInterval.
6361
</action>
62+
<action dev="vincent" type="update" issue="issues/285">
63+
Migrated tests from JUnit 4 to JUnit 5
64+
</action>
6465
</release>
6566
<release version="3.1" date="2024-04-05" description="This is a maintenance release. It includes one
6667
bugfixes and adds two features on existing integrators.">

hipparchus-ode/src/conf/spotbugs-exclude-filter.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
<Bug pattern="EI_EXPOSE_REP2" />
114114
</Match>
115115
<Match>
116-
<Class name="org.hipparchus.ode.nonstiff.RungeKuttaFieldIntegrator"/>
116+
<Class name="org.hipparchus.ode.nonstiff.FixedStepRungeKuttaFieldIntegrator"/>
117117
<Method name="getDefaultStep"/>
118118
<Bug pattern="EI_EXPOSE_REP" />
119119
</Match>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package org.hipparchus.ode.nonstiff;
1919

2020
/** This interface represents an integrator based on Butcher arrays.
21-
* @see RungeKuttaIntegrator
21+
* @see FixedStepRungeKuttaIntegrator
2222
* @see EmbeddedRungeKuttaIntegrator
2323
*/
2424
public interface ButcherArrayProvider {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
*/
5454

5555
public class ClassicalRungeKuttaFieldIntegrator<T extends CalculusFieldElement<T>>
56-
extends RungeKuttaFieldIntegrator<T> {
56+
extends FixedStepRungeKuttaFieldIntegrator<T> {
5757

5858
/** Name of integration scheme. */
5959
public static final String METHOD_NAME = ClassicalRungeKuttaIntegrator.METHOD_NAME;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
* @see LutherIntegrator
4444
*/
4545

46-
public class ClassicalRungeKuttaIntegrator extends RungeKuttaIntegrator {
46+
public class ClassicalRungeKuttaIntegrator extends FixedStepRungeKuttaIntegrator {
4747

4848
/** Name of integration scheme. */
4949
public static final String METHOD_NAME = "classical Runge-Kutta";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
* @param <T> the type of the field elements
5757
*/
5858

59-
public class EulerFieldIntegrator<T extends CalculusFieldElement<T>> extends RungeKuttaFieldIntegrator<T> {
59+
public class EulerFieldIntegrator<T extends CalculusFieldElement<T>> extends FixedStepRungeKuttaFieldIntegrator<T> {
6060

6161
/** Name of integration scheme. */
6262
public static final String METHOD_NAME = EulerIntegrator.METHOD_NAME;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
* @see LutherIntegrator
4848
*/
4949

50-
public class EulerIntegrator extends RungeKuttaIntegrator {
50+
public class EulerIntegrator extends FixedStepRungeKuttaIntegrator {
5151

5252
/** Name of integration scheme. */
5353
public static final String METHOD_NAME = "Euler";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
* </pre>
4141
*
4242
* @see ButcherArrayProvider
43-
* @see RungeKuttaIntegrator
43+
* @see FixedStepRungeKuttaIntegrator
4444
* @see EmbeddedRungeKuttaIntegrator
4545
* @since 3.1
4646
*/

0 commit comments

Comments
 (0)