Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/ContinuousOutputModelTest.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/ContinuousOutputModelTest.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/ContinuousOutputModelTest.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/ContinuousOutputModelTest.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/ContinuousOutputModelTest.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/ContinuousOutputModelTest.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/ContinuousOutputModelTest.java Mon Feb 26 15:12:40 2007 @@ -15,10 +15,16 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; import junit.framework.*; import java.util.Random; + +import org.apache.commons.math.ode.ContinuousOutputModel; +import org.apache.commons.math.ode.DerivativeException; +import org.apache.commons.math.ode.DormandPrince54Integrator; +import org.apache.commons.math.ode.FirstOrderIntegrator; +import org.apache.commons.math.ode.IntegratorException; public class ContinuousOutputModelTest extends TestCase {
Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/DormandPrince54IntegratorTest.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/DormandPrince54IntegratorTest.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/DormandPrince54IntegratorTest.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/DormandPrince54IntegratorTest.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/DormandPrince54IntegratorTest.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/DormandPrince54IntegratorTest.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/DormandPrince54IntegratorTest.java Mon Feb 26 15:12:40 2007 @@ -15,7 +15,16 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; + +import org.apache.commons.math.ode.AdaptiveStepsizeIntegrator; +import org.apache.commons.math.ode.DerivativeException; +import org.apache.commons.math.ode.DormandPrince54Integrator; +import org.apache.commons.math.ode.FirstOrderIntegrator; +import org.apache.commons.math.ode.IntegratorException; +import org.apache.commons.math.ode.StepHandler; +import org.apache.commons.math.ode.StepInterpolator; +import org.apache.commons.math.ode.SwitchingFunction; import junit.framework.*; Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/DormandPrince54StepInterpolatorTest.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/DormandPrince54StepInterpolatorTest.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/DormandPrince54StepInterpolatorTest.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/DormandPrince54StepInterpolatorTest.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/DormandPrince54StepInterpolatorTest.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/DormandPrince54StepInterpolatorTest.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/DormandPrince54StepInterpolatorTest.java Mon Feb 26 15:12:40 2007 @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; import junit.framework.*; import java.util.Random; @@ -24,6 +24,11 @@ import java.io.ObjectOutputStream; import java.io.ObjectInputStream; import java.io.IOException; + +import org.apache.commons.math.ode.ContinuousOutputModel; +import org.apache.commons.math.ode.DerivativeException; +import org.apache.commons.math.ode.DormandPrince54Integrator; +import org.apache.commons.math.ode.IntegratorException; public class DormandPrince54StepInterpolatorTest extends TestCase { Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/DormandPrince853IntegratorTest.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/DormandPrince853IntegratorTest.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/DormandPrince853IntegratorTest.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/DormandPrince853IntegratorTest.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/DormandPrince853IntegratorTest.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/DormandPrince853IntegratorTest.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/DormandPrince853IntegratorTest.java Mon Feb 26 15:12:40 2007 @@ -15,7 +15,16 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; + +import org.apache.commons.math.ode.DerivativeException; +import org.apache.commons.math.ode.DormandPrince853Integrator; +import org.apache.commons.math.ode.DummyStepHandler; +import org.apache.commons.math.ode.FirstOrderIntegrator; +import org.apache.commons.math.ode.IntegratorException; +import org.apache.commons.math.ode.StepHandler; +import org.apache.commons.math.ode.StepInterpolator; +import org.apache.commons.math.ode.SwitchingFunction; import junit.framework.*; Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/DormandPrince853StepInterpolatorTest.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/DormandPrince853StepInterpolatorTest.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/DormandPrince853StepInterpolatorTest.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/DormandPrince853StepInterpolatorTest.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/DormandPrince853StepInterpolatorTest.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/DormandPrince853StepInterpolatorTest.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/DormandPrince853StepInterpolatorTest.java Mon Feb 26 15:12:40 2007 @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; import junit.framework.*; import java.util.Random; @@ -24,6 +24,11 @@ import java.io.ObjectOutputStream; import java.io.ObjectInputStream; import java.io.IOException; + +import org.apache.commons.math.ode.ContinuousOutputModel; +import org.apache.commons.math.ode.DerivativeException; +import org.apache.commons.math.ode.DormandPrince853Integrator; +import org.apache.commons.math.ode.IntegratorException; public class DormandPrince853StepInterpolatorTest extends TestCase { Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/EulerIntegratorTest.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/EulerIntegratorTest.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/EulerIntegratorTest.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/EulerIntegratorTest.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/EulerIntegratorTest.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/EulerIntegratorTest.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/EulerIntegratorTest.java Mon Feb 26 15:12:40 2007 @@ -15,13 +15,15 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; import junit.framework.*; -import org.spaceroots.mantissa.estimation.EstimationException; -import org.spaceroots.mantissa.estimation.LevenbergMarquardtEstimator; -import org.spaceroots.mantissa.fitting.PolynomialFitter; +import org.apache.commons.math.ode.DerivativeException; +import org.apache.commons.math.ode.EulerIntegrator; +import org.apache.commons.math.ode.FirstOrderIntegrator; +import org.apache.commons.math.ode.IntegratorException; +import org.apache.commons.math.ode.SwitchingFunction; public class EulerIntegratorTest extends TestCase { @@ -75,48 +77,6 @@ previousError = error; } - - } - - } - - public void testOrder() - throws EstimationException, DerivativeException, - IntegratorException { - PolynomialFitter fitter = - new PolynomialFitter(1, new LevenbergMarquardtEstimator()); - - TestProblemAbstract[] problems = TestProblemFactory.getProblems(); - for (int k = 0; k < problems.length; ++k) { - - for (int i = 0; i < 10; ++i) { - - TestProblemAbstract pb = (TestProblemAbstract) problems[k].clone(); - double step = (pb.getFinalTime() - pb.getInitialTime()) - * Math.pow(2.0, -(i + 1)); - - FirstOrderIntegrator integ = new EulerIntegrator(step); - TestProblemHandler handler = new TestProblemHandler(pb); - integ.setStepHandler(handler); - SwitchingFunction[] functions = pb.getSwitchingFunctions(); - for (int l = 0; l < functions.length; ++l) { - integ.addSwitchingFunction(functions[l], - Double.POSITIVE_INFINITY, 1.0e-6 * step); - } - integ.integrate(pb, - pb.getInitialTime(), pb.getInitialState(), - pb.getFinalTime(), new double[pb.getDimension()]); - - fitter.addWeightedPair(1.0, - Math.log(Math.abs(step)), - Math.log(handler.getLastError())); - - } - - // this is an order 1 method - double[] coeffs = fitter.fit(); - assertTrue(coeffs[1] > 0.2); - assertTrue(coeffs[1] < 1.8); } Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/EulerStepInterpolatorTest.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/EulerStepInterpolatorTest.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/EulerStepInterpolatorTest.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/EulerStepInterpolatorTest.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/EulerStepInterpolatorTest.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/EulerStepInterpolatorTest.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/EulerStepInterpolatorTest.java Mon Feb 26 15:12:40 2007 @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; import junit.framework.*; import java.util.Random; @@ -24,6 +24,13 @@ import java.io.ObjectOutputStream; import java.io.ObjectInputStream; import java.io.IOException; + +import org.apache.commons.math.ode.ContinuousOutputModel; +import org.apache.commons.math.ode.DerivativeException; +import org.apache.commons.math.ode.EulerIntegrator; +import org.apache.commons.math.ode.EulerStepInterpolator; +import org.apache.commons.math.ode.FirstOrderDifferentialEquations; +import org.apache.commons.math.ode.IntegratorException; public class EulerStepInterpolatorTest extends TestCase { Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/FirstOrderConverterTest.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/FirstOrderConverterTest.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/FirstOrderConverterTest.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/FirstOrderConverterTest.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/FirstOrderConverterTest.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/FirstOrderConverterTest.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/FirstOrderConverterTest.java Mon Feb 26 15:12:40 2007 @@ -15,7 +15,13 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; + +import org.apache.commons.math.ode.ClassicalRungeKuttaIntegrator; +import org.apache.commons.math.ode.DerivativeException; +import org.apache.commons.math.ode.FirstOrderConverter; +import org.apache.commons.math.ode.IntegratorException; +import org.apache.commons.math.ode.SecondOrderDifferentialEquations; import junit.framework.*; Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/GillIntegratorTest.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/GillIntegratorTest.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/GillIntegratorTest.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/GillIntegratorTest.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/GillIntegratorTest.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/GillIntegratorTest.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/GillIntegratorTest.java Mon Feb 26 15:12:40 2007 @@ -15,13 +15,17 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; import junit.framework.*; -import org.spaceroots.mantissa.estimation.EstimationException; -import org.spaceroots.mantissa.estimation.LevenbergMarquardtEstimator; -import org.spaceroots.mantissa.fitting.PolynomialFitter; +import org.apache.commons.math.ode.DerivativeException; +import org.apache.commons.math.ode.FirstOrderIntegrator; +import org.apache.commons.math.ode.GillIntegrator; +import org.apache.commons.math.ode.IntegratorException; +import org.apache.commons.math.ode.StepHandler; +import org.apache.commons.math.ode.StepInterpolator; +import org.apache.commons.math.ode.SwitchingFunction; public class GillIntegratorTest extends TestCase { @@ -73,47 +77,6 @@ } previousError = error; } - - } - - } - - public void testOrder() - throws EstimationException, DerivativeException, - IntegratorException { - PolynomialFitter fitter = - new PolynomialFitter(1, new LevenbergMarquardtEstimator()); - - TestProblemAbstract[] problems = TestProblemFactory.getProblems(); - for (int k = 0; k < problems.length; ++k) { - - for (int i = 0; i < 10; ++i) { - - TestProblemAbstract pb = (TestProblemAbstract) problems[k].clone(); - double step = (pb.getFinalTime() - pb.getInitialTime()) - * Math.pow(2.0, -(i + 1)); - - FirstOrderIntegrator integ = new GillIntegrator(step); - TestProblemHandler handler = new TestProblemHandler(pb); - integ.setStepHandler(handler); - SwitchingFunction[] functions = pb.getSwitchingFunctions(); - for (int l = 0; l < functions.length; ++l) { - integ.addSwitchingFunction(functions[l], - Double.POSITIVE_INFINITY, 1.0e-6 * step); - } - integ.integrate(pb, pb.getInitialTime(), pb.getInitialState(), - pb.getFinalTime(), new double[pb.getDimension()]); - - fitter.addWeightedPair(1.0, - Math.log(Math.abs(step)), - Math.log(handler.getLastError())); - - } - - // this is an order 4 method - double[] coeffs = fitter.fit(); - assertTrue(coeffs[1] > 3.2); - assertTrue(coeffs[1] < 4.8); } Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/GillStepInterpolatorTest.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/GillStepInterpolatorTest.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/GillStepInterpolatorTest.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/GillStepInterpolatorTest.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/GillStepInterpolatorTest.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/GillStepInterpolatorTest.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/GillStepInterpolatorTest.java Mon Feb 26 15:12:40 2007 @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; import junit.framework.*; import java.util.Random; @@ -24,6 +24,11 @@ import java.io.ObjectOutputStream; import java.io.ObjectInputStream; import java.io.IOException; + +import org.apache.commons.math.ode.ContinuousOutputModel; +import org.apache.commons.math.ode.DerivativeException; +import org.apache.commons.math.ode.GillIntegrator; +import org.apache.commons.math.ode.IntegratorException; public class GillStepInterpolatorTest extends TestCase { Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/GraggBulirschStoerIntegratorTest.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/GraggBulirschStoerIntegratorTest.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/GraggBulirschStoerIntegratorTest.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/GraggBulirschStoerIntegratorTest.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/GraggBulirschStoerIntegratorTest.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/GraggBulirschStoerIntegratorTest.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/GraggBulirschStoerIntegratorTest.java Mon Feb 26 15:12:40 2007 @@ -15,7 +15,15 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; + +import org.apache.commons.math.ode.DerivativeException; +import org.apache.commons.math.ode.FirstOrderIntegrator; +import org.apache.commons.math.ode.GraggBulirschStoerIntegrator; +import org.apache.commons.math.ode.IntegratorException; +import org.apache.commons.math.ode.StepHandler; +import org.apache.commons.math.ode.StepInterpolator; +import org.apache.commons.math.ode.SwitchingFunction; import junit.framework.*; Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/GraggBulirschStoerStepInterpolatorTest.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/GraggBulirschStoerStepInterpolatorTest.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/GraggBulirschStoerStepInterpolatorTest.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/GraggBulirschStoerStepInterpolatorTest.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/GraggBulirschStoerStepInterpolatorTest.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/GraggBulirschStoerStepInterpolatorTest.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/GraggBulirschStoerStepInterpolatorTest.java Mon Feb 26 15:12:40 2007 @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; import junit.framework.*; import java.util.Random; @@ -24,6 +24,11 @@ import java.io.ObjectOutputStream; import java.io.ObjectInputStream; import java.io.IOException; + +import org.apache.commons.math.ode.ContinuousOutputModel; +import org.apache.commons.math.ode.DerivativeException; +import org.apache.commons.math.ode.GraggBulirschStoerIntegrator; +import org.apache.commons.math.ode.IntegratorException; public class GraggBulirschStoerStepInterpolatorTest extends TestCase { Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/HighamHall54IntegratorTest.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/HighamHall54IntegratorTest.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/HighamHall54IntegratorTest.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/HighamHall54IntegratorTest.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/HighamHall54IntegratorTest.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/HighamHall54IntegratorTest.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/HighamHall54IntegratorTest.java Mon Feb 26 15:12:40 2007 @@ -15,7 +15,15 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; + +import org.apache.commons.math.ode.DerivativeException; +import org.apache.commons.math.ode.FirstOrderIntegrator; +import org.apache.commons.math.ode.HighamHall54Integrator; +import org.apache.commons.math.ode.IntegratorException; +import org.apache.commons.math.ode.StepHandler; +import org.apache.commons.math.ode.StepInterpolator; +import org.apache.commons.math.ode.SwitchingFunction; import junit.framework.*; Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/HighamHall54StepInterpolatorTest.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/HighamHall54StepInterpolatorTest.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/HighamHall54StepInterpolatorTest.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/HighamHall54StepInterpolatorTest.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/HighamHall54StepInterpolatorTest.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/HighamHall54StepInterpolatorTest.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/HighamHall54StepInterpolatorTest.java Mon Feb 26 15:12:40 2007 @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; import junit.framework.*; import java.util.Random; @@ -24,6 +24,11 @@ import java.io.ObjectOutputStream; import java.io.ObjectInputStream; import java.io.IOException; + +import org.apache.commons.math.ode.ContinuousOutputModel; +import org.apache.commons.math.ode.DerivativeException; +import org.apache.commons.math.ode.HighamHall54Integrator; +import org.apache.commons.math.ode.IntegratorException; public class HighamHall54StepInterpolatorTest extends TestCase { Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/MidpointIntegratorTest.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/MidpointIntegratorTest.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/MidpointIntegratorTest.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/MidpointIntegratorTest.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/MidpointIntegratorTest.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/MidpointIntegratorTest.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/MidpointIntegratorTest.java Mon Feb 26 15:12:40 2007 @@ -15,13 +15,15 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; import junit.framework.*; -import org.spaceroots.mantissa.estimation.EstimationException; -import org.spaceroots.mantissa.estimation.LevenbergMarquardtEstimator; -import org.spaceroots.mantissa.fitting.PolynomialFitter; +import org.apache.commons.math.ode.DerivativeException; +import org.apache.commons.math.ode.FirstOrderIntegrator; +import org.apache.commons.math.ode.IntegratorException; +import org.apache.commons.math.ode.MidpointIntegrator; +import org.apache.commons.math.ode.SwitchingFunction; public class MidpointIntegratorTest extends TestCase { @@ -73,47 +75,6 @@ } previousError = error; } - - } - - } - - public void testOrder() - throws EstimationException, DerivativeException, IntegratorException { - PolynomialFitter fitter = - new PolynomialFitter(1, new LevenbergMarquardtEstimator()); - - TestProblemAbstract[] problems = TestProblemFactory.getProblems(); - for (int k = 0; k < problems.length; ++k) { - - for (int i = 0; i < 10; ++i) { - - TestProblemAbstract pb = (TestProblemAbstract) problems[k].clone(); - double step = (pb.getFinalTime() - pb.getInitialTime()) - * Math.pow(2.0, -(i + 1)); - - FirstOrderIntegrator integ = new MidpointIntegrator(step); - TestProblemHandler handler = new TestProblemHandler(pb); - integ.setStepHandler(handler); - SwitchingFunction[] functions = pb.getSwitchingFunctions(); - for (int l = 0; l < functions.length; ++l) { - integ.addSwitchingFunction(functions[l], - Double.POSITIVE_INFINITY, 1.0e-6 * step); - } - integ.integrate(pb, - pb.getInitialTime(), pb.getInitialState(), - pb.getFinalTime(), new double[pb.getDimension()]); - - fitter.addWeightedPair(1.0, - Math.log(Math.abs(step)), - Math.log(handler.getLastError())); - - } - - // this is an order 2 method - double[] coeffs = fitter.fit(); - assertTrue(coeffs[1] > 1.2); - assertTrue(coeffs[1] < 2.8); } Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/MidpointStepInterpolatorTest.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/MidpointStepInterpolatorTest.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/MidpointStepInterpolatorTest.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/MidpointStepInterpolatorTest.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/MidpointStepInterpolatorTest.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/MidpointStepInterpolatorTest.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/MidpointStepInterpolatorTest.java Mon Feb 26 15:12:40 2007 @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; import junit.framework.*; import java.util.Random; @@ -24,6 +24,11 @@ import java.io.ObjectOutputStream; import java.io.ObjectInputStream; import java.io.IOException; + +import org.apache.commons.math.ode.ContinuousOutputModel; +import org.apache.commons.math.ode.DerivativeException; +import org.apache.commons.math.ode.IntegratorException; +import org.apache.commons.math.ode.MidpointIntegrator; public class MidpointStepInterpolatorTest extends TestCase { Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/StepNormalizerTest.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/StepNormalizerTest.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/StepNormalizerTest.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/StepNormalizerTest.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/StepNormalizerTest.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/StepNormalizerTest.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/StepNormalizerTest.java Mon Feb 26 15:12:40 2007 @@ -15,7 +15,14 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; + +import org.apache.commons.math.ode.DerivativeException; +import org.apache.commons.math.ode.DormandPrince54Integrator; +import org.apache.commons.math.ode.FirstOrderIntegrator; +import org.apache.commons.math.ode.FixedStepHandler; +import org.apache.commons.math.ode.IntegratorException; +import org.apache.commons.math.ode.StepNormalizer; import junit.framework.*; Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/StepProblem.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/StepProblem.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/StepProblem.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/StepProblem.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/StepProblem.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/StepProblem.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/StepProblem.java Mon Feb 26 15:12:40 2007 @@ -1,4 +1,7 @@ -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; + +import org.apache.commons.math.ode.FirstOrderDifferentialEquations; +import org.apache.commons.math.ode.SwitchingFunction; public class StepProblem Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblem1.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem1.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblem1.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem1.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblem1.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem1.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblem1.java Mon Feb 26 15:12:40 2007 @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; /** * This class is used in the junit tests for the ODE integrators. Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblem2.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem2.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblem2.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem2.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblem2.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem2.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblem2.java Mon Feb 26 15:12:40 2007 @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; /** * This class is used in the junit tests for the ODE integrators. Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblem3.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem3.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblem3.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem3.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblem3.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem3.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblem3.java Mon Feb 26 15:12:40 2007 @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; /** * This class is used in the junit tests for the ODE integrators. Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblem4.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem4.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblem4.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem4.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblem4.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem4.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblem4.java Mon Feb 26 15:12:40 2007 @@ -15,7 +15,9 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; + +import org.apache.commons.math.ode.SwitchingFunction; /** * This class is used in the junit tests for the ODE integrators. Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblem5.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem5.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblem5.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem5.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblem5.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem5.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblem5.java Mon Feb 26 15:12:40 2007 @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; /** * This class is used in the junit tests for the ODE integrators. Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblemAbstract.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblemAbstract.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblemAbstract.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblemAbstract.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblemAbstract.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblemAbstract.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblemAbstract.java Mon Feb 26 15:12:40 2007 @@ -15,7 +15,10 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; + +import org.apache.commons.math.ode.FirstOrderDifferentialEquations; +import org.apache.commons.math.ode.SwitchingFunction; /** * This class is used as the base class of the problems that are Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblemFactory.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblemFactory.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblemFactory.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblemFactory.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblemFactory.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblemFactory.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblemFactory.java Mon Feb 26 15:12:40 2007 @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; /** * This class is used in the junit tests for the ODE integrators. Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblemHandler.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblemHandler.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblemHandler.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblemHandler.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblemHandler.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblemHandler.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/TestProblemHandler.java Mon Feb 26 15:12:40 2007 @@ -15,7 +15,11 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; + +import org.apache.commons.math.ode.DerivativeException; +import org.apache.commons.math.ode.StepHandler; +import org.apache.commons.math.ode.StepInterpolator; /** * This class is used to handle steps for the test problems Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/ThreeEighthesIntegratorTest.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/ThreeEighthesIntegratorTest.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/ThreeEighthesIntegratorTest.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/ThreeEighthesIntegratorTest.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/ThreeEighthesIntegratorTest.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/ThreeEighthesIntegratorTest.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/ThreeEighthesIntegratorTest.java Mon Feb 26 15:12:40 2007 @@ -15,13 +15,17 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; import junit.framework.*; -import org.spaceroots.mantissa.estimation.EstimationException; -import org.spaceroots.mantissa.estimation.LevenbergMarquardtEstimator; -import org.spaceroots.mantissa.fitting.PolynomialFitter; +import org.apache.commons.math.ode.DerivativeException; +import org.apache.commons.math.ode.FirstOrderIntegrator; +import org.apache.commons.math.ode.IntegratorException; +import org.apache.commons.math.ode.StepHandler; +import org.apache.commons.math.ode.StepInterpolator; +import org.apache.commons.math.ode.SwitchingFunction; +import org.apache.commons.math.ode.ThreeEighthesIntegrator; public class ThreeEighthesIntegratorTest extends TestCase { @@ -78,48 +82,7 @@ } - public void testOrder() - throws EstimationException, DerivativeException, - IntegratorException { - PolynomialFitter fitter = - new PolynomialFitter(1, new LevenbergMarquardtEstimator()); - - TestProblemAbstract[] problems = TestProblemFactory.getProblems(); - for (int k = 0; k < problems.length; ++k) { - - for (int i = 0; i < 10; ++i) { - - TestProblemAbstract pb = (TestProblemAbstract) problems[k].clone(); - double step = (pb.getFinalTime() - pb.getInitialTime()) - * Math.pow(2.0, -(i + 1)); - - FirstOrderIntegrator integ = new ThreeEighthesIntegrator(step); - TestProblemHandler handler = new TestProblemHandler(pb); - integ.setStepHandler(handler); - SwitchingFunction[] functions = pb.getSwitchingFunctions(); - for (int l = 0; l < functions.length; ++l) { - integ.addSwitchingFunction(functions[l], - Double.POSITIVE_INFINITY, 1.0e-6 * step); - } - integ.integrate(pb, pb.getInitialTime(), pb.getInitialState(), - pb.getFinalTime(), new double[pb.getDimension()]); - - fitter.addWeightedPair(1.0, - Math.log(Math.abs(step)), - Math.log(handler.getLastError())); - - } - - // this is an order 4 method - double[] coeffs = fitter.fit(); - assertTrue(coeffs[1] > 3.2); - assertTrue(coeffs[1] < 4.8); - - } - - } - - public void testSmallStep() + public void testSmallStep() throws DerivativeException, IntegratorException { TestProblem1 pb = new TestProblem1(); Copied: jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/ThreeEighthesStepInterpolatorTest.java (from r512064, jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/ThreeEighthesStepInterpolatorTest.java) URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/ThreeEighthesStepInterpolatorTest.java?view=diff&rev=512066&p1=jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/ThreeEighthesStepInterpolatorTest.java&r1=512064&p2=jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/ThreeEighthesStepInterpolatorTest.java&r2=512066 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/ThreeEighthesStepInterpolatorTest.java (original) +++ jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/ThreeEighthesStepInterpolatorTest.java Mon Feb 26 15:12:40 2007 @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.spaceroots.mantissa.ode; +package org.apache.commons.math.ode; import junit.framework.*; import java.util.Random; @@ -24,6 +24,11 @@ import java.io.ObjectOutputStream; import java.io.ObjectInputStream; import java.io.IOException; + +import org.apache.commons.math.ode.ContinuousOutputModel; +import org.apache.commons.math.ode.DerivativeException; +import org.apache.commons.math.ode.IntegratorException; +import org.apache.commons.math.ode.ThreeEighthesIntegrator; public class ThreeEighthesStepInterpolatorTest extends TestCase { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
