commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From l..@apache.org
Subject svn commit: r1295772 - in /commons/proper/math/trunk/src: main/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerIntegrator.java test/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerIntegratorTest.java
Date Thu, 01 Mar 2012 20:26:11 GMT
Author: luc
Date: Thu Mar  1 20:26:10 2012
New Revision: 1295772

URL: http://svn.apache.org/viewvc?rev=1295772&view=rev
Log:
Fixed a findbugs warning.

The setStepsizeControl method in GraggBulirschStoerIntegrator has been
renamed setControlFactors to avoid confusion with the parent class
setStepSizeControl method.

Modified:
    commons/proper/math/trunk/src/main/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerIntegrator.java
    commons/proper/math/trunk/src/test/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerIntegratorTest.java

Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerIntegrator.java?rev=1295772&r1=1295771&r2=1295772&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerIntegrator.java
(original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerIntegrator.java
Thu Mar  1 20:26:10 2012
@@ -170,7 +170,7 @@ public class GraggBulirschStoerIntegrato
     super(METHOD_NAME, minStep, maxStep,
           scalAbsoluteTolerance, scalRelativeTolerance);
     setStabilityCheck(true, -1, -1, -1);
-    setStepsizeControl(-1, -1, -1, -1);
+    setControlFactors(-1, -1, -1, -1);
     setOrderControl(-1, -1, -1);
     setInterpolationControl(true, -1);
   }
@@ -192,7 +192,7 @@ public class GraggBulirschStoerIntegrato
     super(METHOD_NAME, minStep, maxStep,
           vecAbsoluteTolerance, vecRelativeTolerance);
     setStabilityCheck(true, -1, -1, -1);
-    setStepsizeControl(-1, -1, -1, -1);
+    setControlFactors(-1, -1, -1, -1);
     setOrderControl(-1, -1, -1);
     setInterpolationControl(true, -1);
   }
@@ -255,8 +255,8 @@ public class GraggBulirschStoerIntegrato
    * @param control4 fourth stepsize control factor (the factor
    * is reset to default if lower than 1.0001 or greater than 999.9)
    */
-  public void setStepsizeControl(final double control1, final double control2,
-                                 final double control3, final double control4) {
+  public void setControlFactors(final double control1, final double control2,
+                                final double control3, final double control4) {
 
     if ((control1 < 0.0001) || (control1 > 0.9999)) {
       this.stepControl1 = 0.65;

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerIntegratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerIntegratorTest.java?rev=1295772&r1=1295771&r2=1295772&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerIntegratorTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerIntegratorTest.java
Thu Mar  1 20:26:10 2012
@@ -155,9 +155,9 @@ public class GraggBulirschStoerIntegrato
     Assert.assertTrue(errorWithDefaultSettings < getMaxError(integ, pb));
     integ.setStabilityCheck(true, -1, -1, -1);
 
-    integ.setStepsizeControl(0.5, 0.99, 0.1, 2.5);
+    integ.setControlFactors(0.5, 0.99, 0.1, 2.5);
     Assert.assertTrue(errorWithDefaultSettings < getMaxError(integ, pb));
-    integ.setStepsizeControl(-1, -1, -1, -1);
+    integ.setControlFactors(-1, -1, -1, -1);
 
     integ.setOrderControl(10, 0.7, 0.95);
     Assert.assertTrue(errorWithDefaultSettings < getMaxError(integ, pb));



Mime
View raw message