Added tests for the Dormand-Prince 5(4) integrator. BEWARE! These test do not pass yet. The integrator is currently not consistent with the regular double-based integrator.
Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/2e4b80f8 Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/2e4b80f8 Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/2e4b80f8 Branch: refs/heads/master Commit: 2e4b80f86606e8ee3e363ad4860afdd50503374c Parents: 7fc003d Author: Luc Maisonobe <l...@apache.org> Authored: Wed Jan 6 12:41:33 2016 +0100 Committer: Luc Maisonobe <l...@apache.org> Committed: Wed Jan 6 12:41:33 2016 +0100 ---------------------------------------------------------------------- .../DormandPrince54FieldIntegratorTest.java | 93 ++++++++++++++++++++ ...ormandPrince54FieldStepInterpolatorTest.java | 49 +++++++++++ 2 files changed, 142 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-math/blob/2e4b80f8/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54FieldIntegratorTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54FieldIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54FieldIntegratorTest.java new file mode 100644 index 0000000..4015ffe --- /dev/null +++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54FieldIntegratorTest.java @@ -0,0 +1,93 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.commons.math4.ode.nonstiff; + + +import org.apache.commons.math4.Field; +import org.apache.commons.math4.RealFieldElement; +import org.apache.commons.math4.util.Decimal64Field; +import org.junit.Test; + +public class DormandPrince54FieldIntegratorTest extends AbstractEmbeddedRungeKuttaFieldIntegratorTest { + + protected <T extends RealFieldElement<T>> EmbeddedRungeKuttaFieldIntegrator<T> + createIntegrator(Field<T> field, final double minStep, final double maxStep, + final double scalAbsoluteTolerance, final double scalRelativeTolerance) { + return new DormandPrince54FieldIntegrator<T>(field, minStep, maxStep, scalAbsoluteTolerance, scalRelativeTolerance); + } + + protected <T extends RealFieldElement<T>> EmbeddedRungeKuttaFieldIntegrator<T> + createIntegrator(Field<T> field, final double minStep, final double maxStep, + final double[] vecAbsoluteTolerance, final double[] vecRelativeTolerance) { + return new DormandPrince54FieldIntegrator<T>(field, minStep, maxStep, vecAbsoluteTolerance, vecRelativeTolerance); + } + + @Test + public void testNonFieldIntegratorConsistency() { + doTestNonFieldIntegratorConsistency(Decimal64Field.getInstance()); + } + + @Test + public void testSanityChecks() { + doTestSanityChecks(Decimal64Field.getInstance()); + } + + @Test + public void testBackward() { + doTestBackward(Decimal64Field.getInstance(), 2.0e-7, 2.0e-7, 1.0e-12, "Dormand-Prince 5(4)"); + } + + @Test + public void testKepler() { + doTestKepler(Decimal64Field.getInstance(), 7.0e-10); + } + + @Override + public void testForwardBackwardExceptions() { + doTestForwardBackwardExceptions(Decimal64Field.getInstance()); + } + + @Override + public void testMinStep() { + doTestMinStep(Decimal64Field.getInstance()); + } + + @Override + public void testIncreasingTolerance() { + // the 0.7 factor is only valid for this test + // and has been obtained from trial and error + // there is no general relation between local and global errors + doTestIncreasingTolerance(Decimal64Field.getInstance(), 0.7, 1.0e-12); + } + + @Override + public void testEvents() { + doTestEvents(Decimal64Field.getInstance(), 5.0e-6, "Dormand-Prince 5(4)"); + } + + @Override + public void testEventsErrors() { + doTestEventsErrors(Decimal64Field.getInstance()); + } + + @Override + public void testEventsNoConvergence() { + doTestEventsNoConvergence(Decimal64Field.getInstance()); + } + +} http://git-wip-us.apache.org/repos/asf/commons-math/blob/2e4b80f8/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54FieldStepInterpolatorTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54FieldStepInterpolatorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54FieldStepInterpolatorTest.java new file mode 100644 index 0000000..9facccd --- /dev/null +++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54FieldStepInterpolatorTest.java @@ -0,0 +1,49 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.commons.math4.ode.nonstiff; + + +import org.apache.commons.math4.Field; +import org.apache.commons.math4.RealFieldElement; +import org.apache.commons.math4.ode.FieldEquationsMapper; +import org.apache.commons.math4.util.Decimal64Field; +import org.junit.Test; + +public class DormandPrince54FieldStepInterpolatorTest extends AbstractRungeKuttaFieldStepInterpolatorTest { + + protected <T extends RealFieldElement<T>> RungeKuttaFieldStepInterpolator<T> + createInterpolator(Field<T> field, boolean forward, FieldEquationsMapper<T> mapper) { + return new DormandPrince54FieldStepInterpolator<T>(field, forward, mapper); + } + + @Test + public void interpolationAtBounds() { + doInterpolationAtBounds(Decimal64Field.getInstance(), 1.0e-50); + } + + @Test + public void interpolationInside() { + doInterpolationInside(Decimal64Field.getInstance(), 4.0e-13, 2.7e-15); + } + + @Test + public void nonFieldInterpolatorConsistency() { + doNonFieldInterpolatorConsistency(Decimal64Field.getInstance(), 4.2e-17, 2.3e-16, 6.7e-16, 8.4e-17); + } + +}