Repository: commons-math Updated Branches: refs/heads/MATH_3_X 82e1a8cd0 -> 264851fcf
Detect start failures with multi-step ODE integrators. JIRA: MATH-1297 Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/264851fc Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/264851fc Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/264851fc Branch: refs/heads/MATH_3_X Commit: 264851fcfcad33513ba4f86441dbca3581134a66 Parents: 82e1a8c Author: Luc Maisonobe <l...@apache.org> Authored: Sun Dec 27 13:33:30 2015 +0100 Committer: Luc Maisonobe <l...@apache.org> Committed: Sun Dec 27 13:33:30 2015 +0100 ---------------------------------------------------------------------- src/changes/changes.xml | 3 +++ .../math3/exception/util/LocalizedFormats.java | 1 + .../commons/math3/ode/MultistepIntegrator.java | 4 ++++ .../util/LocalizedFormats_fr.properties | 1 + .../exception/util/LocalizedFormatsTest.java | 2 +- .../nonstiff/AdamsBashforthIntegratorTest.java | 25 ++++++++++++++++++++ 6 files changed, 35 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-math/blob/264851fc/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index cece47e..2f94e04 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -51,6 +51,9 @@ If the output is not quite correct, check for invisible trailing spaces! </properties> <body> <release version="3.6" date="XXXX-XX-XX" description=""> + <action dev="luc" type="fix" issue="MATH-1297"> + Detect start failures with multi-step ODE integrators. + </action> <action dev="luc" type="add" issue="MATH-1302,MATH-1303"> Added a RotationConvention enumerate to allow specifying the semantics or axis/angle for rotations. This enumerate has two values: http://git-wip-us.apache.org/repos/asf/commons-math/blob/264851fc/src/main/java/org/apache/commons/math3/exception/util/LocalizedFormats.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math3/exception/util/LocalizedFormats.java b/src/main/java/org/apache/commons/math3/exception/util/LocalizedFormats.java index 36dba58..8be9639 100644 --- a/src/main/java/org/apache/commons/math3/exception/util/LocalizedFormats.java +++ b/src/main/java/org/apache/commons/math3/exception/util/LocalizedFormats.java @@ -164,6 +164,7 @@ public enum LocalizedFormats implements Localizable { LOWER_BOUND_NOT_BELOW_UPPER_BOUND("lower bound ({0}) must be strictly less than upper bound ({1})"), /* keep */ LOWER_ENDPOINT_ABOVE_UPPER_ENDPOINT("lower endpoint ({0}) must be less than or equal to upper endpoint ({1})"), MAP_MODIFIED_WHILE_ITERATING("map has been modified while iterating"), + MULTISTEP_STARTER_STOPPED_EARLY("multistep integrator starter stopped early, maybe too large step size"), EVALUATIONS("evaluations"), /* keep */ MAX_COUNT_EXCEEDED("maximal count ({0}) exceeded"), /* keep */ MAX_ITERATIONS_EXCEEDED("maximal number of iterations ({0}) exceeded"), http://git-wip-us.apache.org/repos/asf/commons-math/blob/264851fc/src/main/java/org/apache/commons/math3/ode/MultistepIntegrator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math3/ode/MultistepIntegrator.java b/src/main/java/org/apache/commons/math3/ode/MultistepIntegrator.java index 009819e..07d567d 100644 --- a/src/main/java/org/apache/commons/math3/ode/MultistepIntegrator.java +++ b/src/main/java/org/apache/commons/math3/ode/MultistepIntegrator.java @@ -18,6 +18,7 @@ package org.apache.commons.math3.ode; import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.MathIllegalStateException; import org.apache.commons.math3.exception.MaxCountExceededException; import org.apache.commons.math3.exception.NoBracketingException; import org.apache.commons.math3.exception.NumberIsTooSmallException; @@ -246,6 +247,9 @@ public abstract class MultistepIntegrator extends AdaptiveStepsizeIntegrator { }, t0, y0, t, new double[y0.length]); } + // we should not reach this step + throw new MathIllegalStateException(LocalizedFormats.MULTISTEP_STARTER_STOPPED_EARLY); + } catch (InitializationCompletedMarkerException icme) { // NOPMD // this is the expected nominal interruption of the start integrator http://git-wip-us.apache.org/repos/asf/commons-math/blob/264851fc/src/main/resources/assets/org/apache/commons/math3/exception/util/LocalizedFormats_fr.properties ---------------------------------------------------------------------- diff --git a/src/main/resources/assets/org/apache/commons/math3/exception/util/LocalizedFormats_fr.properties b/src/main/resources/assets/org/apache/commons/math3/exception/util/LocalizedFormats_fr.properties index 8cf559b..78bb57e 100644 --- a/src/main/resources/assets/org/apache/commons/math3/exception/util/LocalizedFormats_fr.properties +++ b/src/main/resources/assets/org/apache/commons/math3/exception/util/LocalizedFormats_fr.properties @@ -142,6 +142,7 @@ MAX_ITERATIONS_EXCEEDED = nombre maximal d''it\u00e9rations ({0}) d\u00e9pass\u0 MINIMAL_STEPSIZE_REACHED_DURING_INTEGRATION = pas minimal ({1,number,0.00E00}) atteint, l''int\u00e9gration n\u00e9cessite {0,number,0.00E00} MISMATCHED_LOESS_ABSCISSA_ORDINATE_ARRAYS = Loess a besoin de tableaux d''abscisses et d''ordonn\u00e9es de m\u00eame taille, mais il y a {0} points en abscisse et {1} en ordonn\u00e9e MUTATION_RATE = proportion de mutation ({0}) +MULTISTEP_STARTER_STOPPED_EARLY = arr\u00eat pr\u00e9matur\u00e9 du d\u00e9marrage de l''int\u00e9grateur multi-pas, taille de pas peut-\u00eatre trop grande"), NAN_ELEMENT_AT_INDEX = l''\u00e9l\u00e9ment {0} est un NaN NAN_VALUE_CONVERSION = les valeurs NaN ne peuvent \u00eatre converties NEGATIVE_BRIGHTNESS_EXPONENT = l''exposant de brillance devrait \u00eatre positif ou null, or e = {0} http://git-wip-us.apache.org/repos/asf/commons-math/blob/264851fc/src/test/java/org/apache/commons/math3/exception/util/LocalizedFormatsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math3/exception/util/LocalizedFormatsTest.java b/src/test/java/org/apache/commons/math3/exception/util/LocalizedFormatsTest.java index 3c2a447..b0ee7c8 100644 --- a/src/test/java/org/apache/commons/math3/exception/util/LocalizedFormatsTest.java +++ b/src/test/java/org/apache/commons/math3/exception/util/LocalizedFormatsTest.java @@ -29,7 +29,7 @@ public class LocalizedFormatsTest { @Test public void testMessageNumber() { - Assert.assertEquals(327, LocalizedFormats.values().length); + Assert.assertEquals(328, LocalizedFormats.values().length); } @Test http://git-wip-us.apache.org/repos/asf/commons-math/blob/264851fc/src/test/java/org/apache/commons/math3/ode/nonstiff/AdamsBashforthIntegratorTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math3/ode/nonstiff/AdamsBashforthIntegratorTest.java b/src/test/java/org/apache/commons/math3/ode/nonstiff/AdamsBashforthIntegratorTest.java index 3f57d9a..465d06f 100644 --- a/src/test/java/org/apache/commons/math3/ode/nonstiff/AdamsBashforthIntegratorTest.java +++ b/src/test/java/org/apache/commons/math3/ode/nonstiff/AdamsBashforthIntegratorTest.java @@ -22,12 +22,14 @@ import java.io.ObjectInput; import java.io.ObjectOutput; import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.MathIllegalStateException; import org.apache.commons.math3.exception.MaxCountExceededException; import org.apache.commons.math3.exception.NoBracketingException; import org.apache.commons.math3.exception.NumberIsTooSmallException; import org.apache.commons.math3.ode.AbstractIntegrator; import org.apache.commons.math3.ode.ExpandableStatefulODE; import org.apache.commons.math3.ode.FirstOrderIntegrator; +import org.apache.commons.math3.ode.MultistepIntegrator; import org.apache.commons.math3.ode.TestProblem1; import org.apache.commons.math3.ode.TestProblem5; import org.apache.commons.math3.ode.TestProblem6; @@ -163,6 +165,29 @@ public class AdamsBashforthIntegratorTest { } + @Test(expected=MathIllegalStateException.class) + public void testStartFailure() { + TestProblem1 pb = new TestProblem1(); + double minStep = 0.0001 * (pb.getFinalTime() - pb.getInitialTime()); + double maxStep = pb.getFinalTime() - pb.getInitialTime(); + double scalAbsoluteTolerance = 1.0e-6; + double scalRelativeTolerance = 1.0e-7; + + MultistepIntegrator integ = + new AdamsBashforthIntegrator(6, minStep, maxStep, + scalAbsoluteTolerance, + scalRelativeTolerance); + integ.setStarterIntegrator(new DormandPrince853Integrator(0.5 * (pb.getFinalTime() - pb.getInitialTime()), + pb.getFinalTime() - pb.getInitialTime(), + 0.1, 0.1)); + TestProblemHandler handler = new TestProblemHandler(pb, integ); + integ.addStepHandler(handler); + integ.integrate(pb, + pb.getInitialTime(), pb.getInitialState(), + pb.getFinalTime(), new double[pb.getDimension()]); + + } + private static class PerfectStarter extends AbstractIntegrator { private final PerfectInterpolator interpolator;
