Modified: websites/production/commons/content/proper/commons-math/testapidocs/src-html/org/apache/commons/math3/ode/nonstiff/DormandPrince853IntegratorTest.html ============================================================================== --- websites/production/commons/content/proper/commons-math/testapidocs/src-html/org/apache/commons/math3/ode/nonstiff/DormandPrince853IntegratorTest.html (original) +++ websites/production/commons/content/proper/commons-math/testapidocs/src-html/org/apache/commons/math3/ode/nonstiff/DormandPrince853IntegratorTest.html Sat Apr 6 23:42:01 2013 @@ -336,84 +336,151 @@ <FONT color="green">333</FONT> Assert.assertEquals(8.0, y[0], 1.0e-12);<a name="line.333"></a> <FONT color="green">334</FONT> }<a name="line.334"></a> <FONT color="green">335</FONT> <a name="line.335"></a> -<FONT color="green">336</FONT> private static class KeplerHandler implements StepHandler {<a name="line.336"></a> -<FONT color="green">337</FONT> public KeplerHandler(TestProblem3 pb) {<a name="line.337"></a> -<FONT color="green">338</FONT> this.pb = pb;<a name="line.338"></a> -<FONT color="green">339</FONT> }<a name="line.339"></a> -<FONT color="green">340</FONT> public void init(double t0, double[] y0, double t) {<a name="line.340"></a> -<FONT color="green">341</FONT> nbSteps = 0;<a name="line.341"></a> -<FONT color="green">342</FONT> maxError = 0;<a name="line.342"></a> -<FONT color="green">343</FONT> }<a name="line.343"></a> -<FONT color="green">344</FONT> public void handleStep(StepInterpolator interpolator, boolean isLast)<a name="line.344"></a> -<FONT color="green">345</FONT> throws MaxCountExceededException {<a name="line.345"></a> -<FONT color="green">346</FONT> <a name="line.346"></a> -<FONT color="green">347</FONT> ++nbSteps;<a name="line.347"></a> -<FONT color="green">348</FONT> for (int a = 1; a < 10; ++a) {<a name="line.348"></a> +<FONT color="green">336</FONT> @Test<a name="line.336"></a> +<FONT color="green">337</FONT> public void testEventsScheduling() {<a name="line.337"></a> +<FONT color="green">338</FONT> <a name="line.338"></a> +<FONT color="green">339</FONT> FirstOrderDifferentialEquations sincos = new FirstOrderDifferentialEquations() {<a name="line.339"></a> +<FONT color="green">340</FONT> <a name="line.340"></a> +<FONT color="green">341</FONT> public int getDimension() {<a name="line.341"></a> +<FONT color="green">342</FONT> return 2;<a name="line.342"></a> +<FONT color="green">343</FONT> }<a name="line.343"></a> +<FONT color="green">344</FONT> <a name="line.344"></a> +<FONT color="green">345</FONT> public void computeDerivatives(double t, double[] y, double[] yDot) {<a name="line.345"></a> +<FONT color="green">346</FONT> yDot[0] = y[1];<a name="line.346"></a> +<FONT color="green">347</FONT> yDot[1] = -y[0];<a name="line.347"></a> +<FONT color="green">348</FONT> }<a name="line.348"></a> <FONT color="green">349</FONT> <a name="line.349"></a> -<FONT color="green">350</FONT> double prev = interpolator.getPreviousTime();<a name="line.350"></a> -<FONT color="green">351</FONT> double curr = interpolator.getCurrentTime();<a name="line.351"></a> -<FONT color="green">352</FONT> double interp = ((10 - a) * prev + a * curr) / 10;<a name="line.352"></a> -<FONT color="green">353</FONT> interpolator.setInterpolatedTime(interp);<a name="line.353"></a> +<FONT color="green">350</FONT> };<a name="line.350"></a> +<FONT color="green">351</FONT> <a name="line.351"></a> +<FONT color="green">352</FONT> SchedulingChecker sinChecker = new SchedulingChecker(0); // events at 0, PI, 2PI ...<a name="line.352"></a> +<FONT color="green">353</FONT> SchedulingChecker cosChecker = new SchedulingChecker(1); // events at PI/2, 3PI/2, 5PI/2 ...<a name="line.353"></a> <FONT color="green">354</FONT> <a name="line.354"></a> -<FONT color="green">355</FONT> double[] interpolatedY = interpolator.getInterpolatedState ();<a name="line.355"></a> -<FONT color="green">356</FONT> double[] theoreticalY = pb.computeTheoreticalState(interpolator.getInterpolatedTime());<a name="line.356"></a> -<FONT color="green">357</FONT> double dx = interpolatedY[0] - theoreticalY[0];<a name="line.357"></a> -<FONT color="green">358</FONT> double dy = interpolatedY[1] - theoreticalY[1];<a name="line.358"></a> -<FONT color="green">359</FONT> double error = dx * dx + dy * dy;<a name="line.359"></a> -<FONT color="green">360</FONT> if (error > maxError) {<a name="line.360"></a> -<FONT color="green">361</FONT> maxError = error;<a name="line.361"></a> -<FONT color="green">362</FONT> }<a name="line.362"></a> -<FONT color="green">363</FONT> }<a name="line.363"></a> -<FONT color="green">364</FONT> if (isLast) {<a name="line.364"></a> -<FONT color="green">365</FONT> Assert.assertTrue(maxError < 2.4e-10);<a name="line.365"></a> -<FONT color="green">366</FONT> Assert.assertTrue(nbSteps < 150);<a name="line.366"></a> -<FONT color="green">367</FONT> }<a name="line.367"></a> -<FONT color="green">368</FONT> }<a name="line.368"></a> -<FONT color="green">369</FONT> private int nbSteps;<a name="line.369"></a> -<FONT color="green">370</FONT> private double maxError;<a name="line.370"></a> -<FONT color="green">371</FONT> private TestProblem3 pb;<a name="line.371"></a> -<FONT color="green">372</FONT> }<a name="line.372"></a> +<FONT color="green">355</FONT> FirstOrderIntegrator integ =<a name="line.355"></a> +<FONT color="green">356</FONT> new DormandPrince853Integrator(0.001, 1.0, 1.0e-12, 0.0);<a name="line.356"></a> +<FONT color="green">357</FONT> integ.addEventHandler(sinChecker, 0.01, 1.0e-7, 100);<a name="line.357"></a> +<FONT color="green">358</FONT> integ.addStepHandler(sinChecker);<a name="line.358"></a> +<FONT color="green">359</FONT> integ.addEventHandler(cosChecker, 0.01, 1.0e-7, 100);<a name="line.359"></a> +<FONT color="green">360</FONT> integ.addStepHandler(cosChecker);<a name="line.360"></a> +<FONT color="green">361</FONT> double t0 = 0.5;<a name="line.361"></a> +<FONT color="green">362</FONT> double[] y0 = new double[] { FastMath.sin(t0), FastMath.cos(t0) };<a name="line.362"></a> +<FONT color="green">363</FONT> double t = 10.0;<a name="line.363"></a> +<FONT color="green">364</FONT> double[] y = new double[2];<a name="line.364"></a> +<FONT color="green">365</FONT> integ.integrate(sincos, t0, y0, t, y);<a name="line.365"></a> +<FONT color="green">366</FONT> <a name="line.366"></a> +<FONT color="green">367</FONT> }<a name="line.367"></a> +<FONT color="green">368</FONT> <a name="line.368"></a> +<FONT color="green">369</FONT> private static class SchedulingChecker implements StepHandler, EventHandler {<a name="line.369"></a> +<FONT color="green">370</FONT> <a name="line.370"></a> +<FONT color="green">371</FONT> int index;<a name="line.371"></a> +<FONT color="green">372</FONT> double tMin;<a name="line.372"></a> <FONT color="green">373</FONT> <a name="line.373"></a> -<FONT color="green">374</FONT> private static class VariableHandler implements StepHandler {<a name="line.374"></a> -<FONT color="green">375</FONT> public VariableHandler() {<a name="line.375"></a> -<FONT color="green">376</FONT> firstTime = true;<a name="line.376"></a> -<FONT color="green">377</FONT> minStep = 0;<a name="line.377"></a> -<FONT color="green">378</FONT> maxStep = 0;<a name="line.378"></a> -<FONT color="green">379</FONT> }<a name="line.379"></a> -<FONT color="green">380</FONT> public void init(double t0, double[] y0, double t) {<a name="line.380"></a> -<FONT color="green">381</FONT> firstTime = true;<a name="line.381"></a> -<FONT color="green">382</FONT> minStep = 0;<a name="line.382"></a> -<FONT color="green">383</FONT> maxStep = 0;<a name="line.383"></a> -<FONT color="green">384</FONT> }<a name="line.384"></a> -<FONT color="green">385</FONT> public void handleStep(StepInterpolator interpolator,<a name="line.385"></a> -<FONT color="green">386</FONT> boolean isLast) {<a name="line.386"></a> -<FONT color="green">387</FONT> <a name="line.387"></a> -<FONT color="green">388</FONT> double step = FastMath.abs(interpolator.getCurrentTime()<a name="line.388"></a> -<FONT color="green">389</FONT> - interpolator.getPreviousTime());<a name="line.389"></a> -<FONT color="green">390</FONT> if (firstTime) {<a name="line.390"></a> -<FONT color="green">391</FONT> minStep = FastMath.abs(step);<a name="line.391"></a> -<FONT color="green">392</FONT> maxStep = minStep;<a name="line.392"></a> -<FONT color="green">393</FONT> firstTime = false;<a name="line.393"></a> -<FONT color="green">394</FONT> } else {<a name="line.394"></a> -<FONT color="green">395</FONT> if (step < minStep) {<a name="line.395"></a> -<FONT color="green">396</FONT> minStep = step;<a name="line.396"></a> -<FONT color="green">397</FONT> }<a name="line.397"></a> -<FONT color="green">398</FONT> if (step > maxStep) {<a name="line.398"></a> -<FONT color="green">399</FONT> maxStep = step;<a name="line.399"></a> -<FONT color="green">400</FONT> }<a name="line.400"></a> -<FONT color="green">401</FONT> }<a name="line.401"></a> +<FONT color="green">374</FONT> public SchedulingChecker(int index) {<a name="line.374"></a> +<FONT color="green">375</FONT> this.index = index;<a name="line.375"></a> +<FONT color="green">376</FONT> }<a name="line.376"></a> +<FONT color="green">377</FONT> <a name="line.377"></a> +<FONT color="green">378</FONT> public void init(double t0, double[] y0, double t) {<a name="line.378"></a> +<FONT color="green">379</FONT> tMin = t0;<a name="line.379"></a> +<FONT color="green">380</FONT> }<a name="line.380"></a> +<FONT color="green">381</FONT> <a name="line.381"></a> +<FONT color="green">382</FONT> public void handleStep(StepInterpolator interpolator, boolean isLast) {<a name="line.382"></a> +<FONT color="green">383</FONT> tMin = interpolator.getCurrentTime();<a name="line.383"></a> +<FONT color="green">384</FONT> }<a name="line.384"></a> +<FONT color="green">385</FONT> <a name="line.385"></a> +<FONT color="green">386</FONT> public double g(double t, double[] y) {<a name="line.386"></a> +<FONT color="green">387</FONT> // once a step has been handled by handleStep,<a name="line.387"></a> +<FONT color="green">388</FONT> // events checking should only refer to dates after the step<a name="line.388"></a> +<FONT color="green">389</FONT> Assert.assertTrue(t >= tMin);<a name="line.389"></a> +<FONT color="green">390</FONT> return y[index];<a name="line.390"></a> +<FONT color="green">391</FONT> }<a name="line.391"></a> +<FONT color="green">392</FONT> <a name="line.392"></a> +<FONT color="green">393</FONT> public Action eventOccurred(double t, double[] y, boolean increasing) {<a name="line.393"></a> +<FONT color="green">394</FONT> return Action.RESET_STATE;<a name="line.394"></a> +<FONT color="green">395</FONT> }<a name="line.395"></a> +<FONT color="green">396</FONT> <a name="line.396"></a> +<FONT color="green">397</FONT> public void resetState(double t, double[] y) {<a name="line.397"></a> +<FONT color="green">398</FONT> // in fact, we don't need to reset anything for the test<a name="line.398"></a> +<FONT color="green">399</FONT> }<a name="line.399"></a> +<FONT color="green">400</FONT> <a name="line.400"></a> +<FONT color="green">401</FONT> }<a name="line.401"></a> <FONT color="green">402</FONT> <a name="line.402"></a> -<FONT color="green">403</FONT> if (isLast) {<a name="line.403"></a> -<FONT color="green">404</FONT> Assert.assertTrue(minStep < (1.0 / 100.0));<a name="line.404"></a> -<FONT color="green">405</FONT> Assert.assertTrue(maxStep > (1.0 / 2.0));<a name="line.405"></a> -<FONT color="green">406</FONT> }<a name="line.406"></a> -<FONT color="green">407</FONT> }<a name="line.407"></a> -<FONT color="green">408</FONT> private boolean firstTime = true;<a name="line.408"></a> -<FONT color="green">409</FONT> private double minStep = 0;<a name="line.409"></a> -<FONT color="green">410</FONT> private double maxStep = 0;<a name="line.410"></a> -<FONT color="green">411</FONT> }<a name="line.411"></a> -<FONT color="green">412</FONT> <a name="line.412"></a> -<FONT color="green">413</FONT> }<a name="line.413"></a> +<FONT color="green">403</FONT> private static class KeplerHandler implements StepHandler {<a name="line.403"></a> +<FONT color="green">404</FONT> public KeplerHandler(TestProblem3 pb) {<a name="line.404"></a> +<FONT color="green">405</FONT> this.pb = pb;<a name="line.405"></a> +<FONT color="green">406</FONT> }<a name="line.406"></a> +<FONT color="green">407</FONT> public void init(double t0, double[] y0, double t) {<a name="line.407"></a> +<FONT color="green">408</FONT> nbSteps = 0;<a name="line.408"></a> +<FONT color="green">409</FONT> maxError = 0;<a name="line.409"></a> +<FONT color="green">410</FONT> }<a name="line.410"></a> +<FONT color="green">411</FONT> public void handleStep(StepInterpolator interpolator, boolean isLast)<a name="line.411"></a> +<FONT color="green">412</FONT> throws MaxCountExceededException {<a name="line.412"></a> +<FONT color="green">413</FONT> <a name="line.413"></a> +<FONT color="green">414</FONT> ++nbSteps;<a name="line.414"></a> +<FONT color="green">415</FONT> for (int a = 1; a < 10; ++a) {<a name="line.415"></a> +<FONT color="green">416</FONT> <a name="line.416"></a> +<FONT color="green">417</FONT> double prev = interpolator.getPreviousTime();<a name="line.417"></a> +<FONT color="green">418</FONT> double curr = interpolator.getCurrentTime();<a name="line.418"></a> +<FONT color="green">419</FONT> double interp = ((10 - a) * prev + a * curr) / 10;<a name="line.419"></a> +<FONT color="green">420</FONT> interpolator.setInterpolatedTime(interp);<a name="line.420"></a> +<FONT color="green">421</FONT> <a name="line.421"></a> +<FONT color="green">422</FONT> double[] interpolatedY = interpolator.getInterpolatedState ();<a name="line.422"></a> +<FONT color="green">423</FONT> double[] theoreticalY = pb.computeTheoreticalState(interpolator.getInterpolatedTime());<a name="line.423"></a> +<FONT color="green">424</FONT> double dx = interpolatedY[0] - theoreticalY[0];<a name="line.424"></a> +<FONT color="green">425</FONT> double dy = interpolatedY[1] - theoreticalY[1];<a name="line.425"></a> +<FONT color="green">426</FONT> double error = dx * dx + dy * dy;<a name="line.426"></a> +<FONT color="green">427</FONT> if (error > maxError) {<a name="line.427"></a> +<FONT color="green">428</FONT> maxError = error;<a name="line.428"></a> +<FONT color="green">429</FONT> }<a name="line.429"></a> +<FONT color="green">430</FONT> }<a name="line.430"></a> +<FONT color="green">431</FONT> if (isLast) {<a name="line.431"></a> +<FONT color="green">432</FONT> Assert.assertTrue(maxError < 2.4e-10);<a name="line.432"></a> +<FONT color="green">433</FONT> Assert.assertTrue(nbSteps < 150);<a name="line.433"></a> +<FONT color="green">434</FONT> }<a name="line.434"></a> +<FONT color="green">435</FONT> }<a name="line.435"></a> +<FONT color="green">436</FONT> private int nbSteps;<a name="line.436"></a> +<FONT color="green">437</FONT> private double maxError;<a name="line.437"></a> +<FONT color="green">438</FONT> private TestProblem3 pb;<a name="line.438"></a> +<FONT color="green">439</FONT> }<a name="line.439"></a> +<FONT color="green">440</FONT> <a name="line.440"></a> +<FONT color="green">441</FONT> private static class VariableHandler implements StepHandler {<a name="line.441"></a> +<FONT color="green">442</FONT> public VariableHandler() {<a name="line.442"></a> +<FONT color="green">443</FONT> firstTime = true;<a name="line.443"></a> +<FONT color="green">444</FONT> minStep = 0;<a name="line.444"></a> +<FONT color="green">445</FONT> maxStep = 0;<a name="line.445"></a> +<FONT color="green">446</FONT> }<a name="line.446"></a> +<FONT color="green">447</FONT> public void init(double t0, double[] y0, double t) {<a name="line.447"></a> +<FONT color="green">448</FONT> firstTime = true;<a name="line.448"></a> +<FONT color="green">449</FONT> minStep = 0;<a name="line.449"></a> +<FONT color="green">450</FONT> maxStep = 0;<a name="line.450"></a> +<FONT color="green">451</FONT> }<a name="line.451"></a> +<FONT color="green">452</FONT> public void handleStep(StepInterpolator interpolator,<a name="line.452"></a> +<FONT color="green">453</FONT> boolean isLast) {<a name="line.453"></a> +<FONT color="green">454</FONT> <a name="line.454"></a> +<FONT color="green">455</FONT> double step = FastMath.abs(interpolator.getCurrentTime()<a name="line.455"></a> +<FONT color="green">456</FONT> - interpolator.getPreviousTime());<a name="line.456"></a> +<FONT color="green">457</FONT> if (firstTime) {<a name="line.457"></a> +<FONT color="green">458</FONT> minStep = FastMath.abs(step);<a name="line.458"></a> +<FONT color="green">459</FONT> maxStep = minStep;<a name="line.459"></a> +<FONT color="green">460</FONT> firstTime = false;<a name="line.460"></a> +<FONT color="green">461</FONT> } else {<a name="line.461"></a> +<FONT color="green">462</FONT> if (step < minStep) {<a name="line.462"></a> +<FONT color="green">463</FONT> minStep = step;<a name="line.463"></a> +<FONT color="green">464</FONT> }<a name="line.464"></a> +<FONT color="green">465</FONT> if (step > maxStep) {<a name="line.465"></a> +<FONT color="green">466</FONT> maxStep = step;<a name="line.466"></a> +<FONT color="green">467</FONT> }<a name="line.467"></a> +<FONT color="green">468</FONT> }<a name="line.468"></a> +<FONT color="green">469</FONT> <a name="line.469"></a> +<FONT color="green">470</FONT> if (isLast) {<a name="line.470"></a> +<FONT color="green">471</FONT> Assert.assertTrue(minStep < (1.0 / 100.0));<a name="line.471"></a> +<FONT color="green">472</FONT> Assert.assertTrue(maxStep > (1.0 / 2.0));<a name="line.472"></a> +<FONT color="green">473</FONT> }<a name="line.473"></a> +<FONT color="green">474</FONT> }<a name="line.474"></a> +<FONT color="green">475</FONT> private boolean firstTime = true;<a name="line.475"></a> +<FONT color="green">476</FONT> private double minStep = 0;<a name="line.476"></a> +<FONT color="green">477</FONT> private double maxStep = 0;<a name="line.477"></a> +<FONT color="green">478</FONT> }<a name="line.478"></a> +<FONT color="green">479</FONT> <a name="line.479"></a> +<FONT color="green">480</FONT> }<a name="line.480"></a>