You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by lu...@apache.org on 2015/06/11 14:05:47 UTC
[math] Fixed error message for unknown parameter name in ODE.
Repository: commons-math
Updated Branches:
refs/heads/MATH_3_X cbea4e6aa -> a8175c038
Fixed error message for unknown parameter name in ODE.
JIRA: MATH-1232
Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/a8175c03
Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/a8175c03
Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/a8175c03
Branch: refs/heads/MATH_3_X
Commit: a8175c03840d95e7fa9e5e19698231a3979953f0
Parents: cbea4e6
Author: Luc Maisonobe <lu...@apache.org>
Authored: Thu Jun 11 13:46:55 2015 +0200
Committer: Luc Maisonobe <lu...@apache.org>
Committed: Thu Jun 11 13:46:55 2015 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
.../math3/ode/UnknownParameterException.java | 2 +-
.../commons/math3/ode/JacobianMatricesTest.java | 25 +++++++++++++++-----
3 files changed, 23 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-math/blob/a8175c03/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index d38f022..da26807 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-1232">
+ Fixed error message for unknown parameter name in ODE.
+ </action>
<action dev="luc" type="fix" issue="MATH-1226">
Fixed wrong event detection in case of close events pairs.
</action>
http://git-wip-us.apache.org/repos/asf/commons-math/blob/a8175c03/src/main/java/org/apache/commons/math3/ode/UnknownParameterException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math3/ode/UnknownParameterException.java b/src/main/java/org/apache/commons/math3/ode/UnknownParameterException.java
index 172ef8c..99f0b9f 100644
--- a/src/main/java/org/apache/commons/math3/ode/UnknownParameterException.java
+++ b/src/main/java/org/apache/commons/math3/ode/UnknownParameterException.java
@@ -38,7 +38,7 @@ public class UnknownParameterException extends MathIllegalArgumentException {
* @param name parameter name.
*/
public UnknownParameterException(final String name) {
- super(LocalizedFormats.UNKNOWN_PARAMETER);
+ super(LocalizedFormats.UNKNOWN_PARAMETER, name);
this.name = name;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/a8175c03/src/test/java/org/apache/commons/math3/ode/JacobianMatricesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math3/ode/JacobianMatricesTest.java b/src/test/java/org/apache/commons/math3/ode/JacobianMatricesTest.java
index 2c45656..6cf7dd2 100644
--- a/src/test/java/org/apache/commons/math3/ode/JacobianMatricesTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/JacobianMatricesTest.java
@@ -93,19 +93,32 @@ public class JacobianMatricesTest {
}
@Test
+ public void testWrongParameterName() {
+ final String name = "an-unknown-parameter";
+ try {
+ ParamBrusselator brusselator = new ParamBrusselator(2.9);
+ brusselator.setParameter(name, 3.0);
+ Assert.fail("an exception should have been thrown");
+ } catch (UnknownParameterException upe) {
+ Assert.assertTrue(upe.getMessage().contains(name));
+ Assert.assertEquals(name, upe.getName());
+ }
+ }
+
+ @Test
public void testInternalDifferentiation()
- throws NumberIsTooSmallException, DimensionMismatchException,
- MaxCountExceededException, NoBracketingException,
- UnknownParameterException, MismatchedEquations {
+ throws NumberIsTooSmallException, DimensionMismatchException,
+ MaxCountExceededException, NoBracketingException,
+ UnknownParameterException, MismatchedEquations {
AbstractIntegrator integ =
- new DormandPrince54Integrator(1.0e-8, 100.0, new double[] { 1.0e-4, 1.0e-4 }, new double[] { 1.0e-4, 1.0e-4 });
+ new DormandPrince54Integrator(1.0e-8, 100.0, new double[] { 1.0e-4, 1.0e-4 }, new double[] { 1.0e-4, 1.0e-4 });
double hP = 1.0e-12;
double hY = 1.0e-12;
SummaryStatistics residualsP0 = new SummaryStatistics();
SummaryStatistics residualsP1 = new SummaryStatistics();
for (double b = 2.88; b < 3.08; b += 0.001) {
- ParamBrusselator brusselator = new ParamBrusselator(b);
- brusselator.setParameter(ParamBrusselator.B, b);
+ ParamBrusselator brusselator = new ParamBrusselator(b);
+ brusselator.setParameter(ParamBrusselator.B, b);
double[] z = { 1.3, b };
double[][] dZdZ0 = new double[2][2];
double[] dZdP = new double[2];