You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@commons.apache.org by lu...@apache.org on 2015/07/27 21:42:10 UTC
svn commit: r959803 [29/32] - in
/websites/production/commons/content/proper/commons-math: jacoco/
jacoco/org.apache.commons.math3.fraction/
jacoco/org.apache.commons.math3.genetics/
jacoco/org.apache.commons.math3.geometry.euclidean.threed/ jacoco/org...
Modified: websites/production/commons/content/proper/commons-math/xref-test/org/apache/commons/math3/ode/events/EventStateTest.html
==============================================================================
--- websites/production/commons/content/proper/commons-math/xref-test/org/apache/commons/math3/ode/events/EventStateTest.html (original)
+++ websites/production/commons/content/proper/commons-math/xref-test/org/apache/commons/math3/ode/events/EventStateTest.html Mon Jul 27 19:42:09 2015
@@ -35,204 +35,252 @@
<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong class="jxr_keyword">import</strong> org.apache.commons.math3.ode.FirstOrderDifferentialEquations;
<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong class="jxr_keyword">import</strong> org.apache.commons.math3.ode.SecondaryEquations;
<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong class="jxr_keyword">import</strong> org.apache.commons.math3.ode.nonstiff.DormandPrince853Integrator;
-<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong class="jxr_keyword">import</strong> org.apache.commons.math3.ode.sampling.AbstractStepInterpolator;
-<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">import</strong> org.apache.commons.math3.ode.sampling.DummyStepInterpolator;
-<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong class="jxr_keyword">import</strong> org.junit.Assert;
-<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong class="jxr_keyword">import</strong> org.junit.Test;
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>
-<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/commons/math3/ode/events/EventStateTest.html">EventStateTest</a> {
-<a class="jxr_linenumber" name="L36" href="#L36">36</a>
-<a class="jxr_linenumber" name="L37" href="#L37">37</a> <em class="jxr_comment">// JIRA: MATH-322</em>
-<a class="jxr_linenumber" name="L38" href="#L38">38</a> @Test
-<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> closeEvents() <strong class="jxr_keyword">throws</strong> MaxCountExceededException, NoBracketingException {
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> r1 = 90.0;
-<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> r2 = 135.0;
-<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> gap = r2 - r1;
-<a class="jxr_linenumber" name="L44" href="#L44">44</a> EventHandler closeEventsGenerator = <strong class="jxr_keyword">new</strong> EventHandler() {
-<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> init(<strong class="jxr_keyword">double</strong> t0, <strong class="jxr_keyword">double</strong>[] y0, <strong class="jxr_keyword">double</strong> t) {
-<a class="jxr_linenumber" name="L46" href="#L46">46</a> }
-<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> resetState(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y) {
-<a class="jxr_linenumber" name="L48" href="#L48">48</a> }
-<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">double</strong> g(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y) {
-<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong class="jxr_keyword">return</strong> (t - r1) * (r2 - t);
-<a class="jxr_linenumber" name="L51" href="#L51">51</a> }
-<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong class="jxr_keyword">public</strong> Action eventOccurred(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y, <strong class="jxr_keyword">boolean</strong> increasing) {
-<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong class="jxr_keyword">return</strong> Action.CONTINUE;
-<a class="jxr_linenumber" name="L54" href="#L54">54</a> }
-<a class="jxr_linenumber" name="L55" href="#L55">55</a> };
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>
-<a class="jxr_linenumber" name="L57" href="#L57">57</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> tolerance = 0.1;
-<a class="jxr_linenumber" name="L58" href="#L58">58</a> EventState es = <strong class="jxr_keyword">new</strong> EventState(closeEventsGenerator, 1.5 * gap,
-<a class="jxr_linenumber" name="L59" href="#L59">59</a> tolerance, 100,
-<a class="jxr_linenumber" name="L60" href="#L60">60</a> <strong class="jxr_keyword">new</strong> BrentSolver(tolerance));
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> es.setExpandable(<strong class="jxr_keyword">new</strong> ExpandableStatefulODE(<strong class="jxr_keyword">new</strong> FirstOrderDifferentialEquations() {
-<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getDimension() {
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong class="jxr_keyword">return</strong> 0;
-<a class="jxr_linenumber" name="L64" href="#L64">64</a> }
-<a class="jxr_linenumber" name="L65" href="#L65">65</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> computeDerivatives(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y, <strong class="jxr_keyword">double</strong>[] yDot) {
-<a class="jxr_linenumber" name="L66" href="#L66">66</a> }
-<a class="jxr_linenumber" name="L67" href="#L67">67</a> }));
+<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong class="jxr_keyword">import</strong> org.apache.commons.math3.ode.nonstiff.LutherIntegrator;
+<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">import</strong> org.apache.commons.math3.ode.sampling.AbstractStepInterpolator;
+<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong class="jxr_keyword">import</strong> org.apache.commons.math3.ode.sampling.DummyStepInterpolator;
+<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong class="jxr_keyword">import</strong> org.junit.Assert;
+<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong class="jxr_keyword">import</strong> org.junit.Test;
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>
+<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/commons/math3/ode/events/EventStateTest.html">EventStateTest</a> {
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>
+<a class="jxr_linenumber" name="L38" href="#L38">38</a> <em class="jxr_comment">// JIRA: MATH-322</em>
+<a class="jxr_linenumber" name="L39" href="#L39">39</a> @Test
+<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> closeEvents() <strong class="jxr_keyword">throws</strong> MaxCountExceededException, NoBracketingException {
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> r1 = 90.0;
+<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> r2 = 135.0;
+<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> gap = r2 - r1;
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>
+<a class="jxr_linenumber" name="L46" href="#L46">46</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> tolerance = 0.1;
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> EventState es = <strong class="jxr_keyword">new</strong> EventState(<strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/math3/ode/events/EventStateTest.html">CloseEventsGenerator</a>(r1, r2), 1.5 * gap,
+<a class="jxr_linenumber" name="L48" href="#L48">48</a> tolerance, 100,
+<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong class="jxr_keyword">new</strong> BrentSolver(tolerance));
+<a class="jxr_linenumber" name="L50" href="#L50">50</a> es.setExpandable(<strong class="jxr_keyword">new</strong> ExpandableStatefulODE(<strong class="jxr_keyword">new</strong> FirstOrderDifferentialEquations() {
+<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getDimension() {
+<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong class="jxr_keyword">return</strong> 0;
+<a class="jxr_linenumber" name="L53" href="#L53">53</a> }
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> computeDerivatives(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y, <strong class="jxr_keyword">double</strong>[] yDot) {
+<a class="jxr_linenumber" name="L55" href="#L55">55</a> }
+<a class="jxr_linenumber" name="L56" href="#L56">56</a> }));
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>
+<a class="jxr_linenumber" name="L58" href="#L58">58</a> AbstractStepInterpolator interpolator =
+<a class="jxr_linenumber" name="L59" href="#L59">59</a> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/math3/ode/sampling/DummyStepInterpolator.html">DummyStepInterpolator</a>(<strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">double</strong>[0], <strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">double</strong>[0], <strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="L60" href="#L60">60</a> interpolator.storeTime(r1 - 2.5 * gap);
+<a class="jxr_linenumber" name="L61" href="#L61">61</a> interpolator.shift();
+<a class="jxr_linenumber" name="L62" href="#L62">62</a> interpolator.storeTime(r1 - 1.5 * gap);
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> es.reinitializeBegin(interpolator);
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>
+<a class="jxr_linenumber" name="L65" href="#L65">65</a> interpolator.shift();
+<a class="jxr_linenumber" name="L66" href="#L66">66</a> interpolator.storeTime(r1 - 0.5 * gap);
+<a class="jxr_linenumber" name="L67" href="#L67">67</a> Assert.assertFalse(es.evaluateStep(interpolator));
<a class="jxr_linenumber" name="L68" href="#L68">68</a>
-<a class="jxr_linenumber" name="L69" href="#L69">69</a> AbstractStepInterpolator interpolator =
-<a class="jxr_linenumber" name="L70" href="#L70">70</a> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/math3/ode/sampling/DummyStepInterpolator.html">DummyStepInterpolator</a>(<strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">double</strong>[0], <strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">double</strong>[0], <strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="L71" href="#L71">71</a> interpolator.storeTime(r1 - 2.5 * gap);
-<a class="jxr_linenumber" name="L72" href="#L72">72</a> interpolator.shift();
-<a class="jxr_linenumber" name="L73" href="#L73">73</a> interpolator.storeTime(r1 - 1.5 * gap);
-<a class="jxr_linenumber" name="L74" href="#L74">74</a> es.reinitializeBegin(interpolator);
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>
-<a class="jxr_linenumber" name="L76" href="#L76">76</a> interpolator.shift();
-<a class="jxr_linenumber" name="L77" href="#L77">77</a> interpolator.storeTime(r1 - 0.5 * gap);
-<a class="jxr_linenumber" name="L78" href="#L78">78</a> Assert.assertFalse(es.evaluateStep(interpolator));
+<a class="jxr_linenumber" name="L69" href="#L69">69</a> interpolator.shift();
+<a class="jxr_linenumber" name="L70" href="#L70">70</a> interpolator.storeTime(0.5 * (r1 + r2));
+<a class="jxr_linenumber" name="L71" href="#L71">71</a> Assert.assertTrue(es.evaluateStep(interpolator));
+<a class="jxr_linenumber" name="L72" href="#L72">72</a> Assert.assertEquals(r1, es.getEventTime(), tolerance);
+<a class="jxr_linenumber" name="L73" href="#L73">73</a> es.stepAccepted(es.getEventTime(), <strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">double</strong>[0]);
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>
+<a class="jxr_linenumber" name="L75" href="#L75">75</a> interpolator.shift();
+<a class="jxr_linenumber" name="L76" href="#L76">76</a> interpolator.storeTime(r2 + 0.4 * gap);
+<a class="jxr_linenumber" name="L77" href="#L77">77</a> Assert.assertTrue(es.evaluateStep(interpolator));
+<a class="jxr_linenumber" name="L78" href="#L78">78</a> Assert.assertEquals(r2, es.getEventTime(), tolerance);
<a class="jxr_linenumber" name="L79" href="#L79">79</a>
-<a class="jxr_linenumber" name="L80" href="#L80">80</a> interpolator.shift();
-<a class="jxr_linenumber" name="L81" href="#L81">81</a> interpolator.storeTime(0.5 * (r1 + r2));
-<a class="jxr_linenumber" name="L82" href="#L82">82</a> Assert.assertTrue(es.evaluateStep(interpolator));
-<a class="jxr_linenumber" name="L83" href="#L83">83</a> Assert.assertEquals(r1, es.getEventTime(), tolerance);
-<a class="jxr_linenumber" name="L84" href="#L84">84</a> es.stepAccepted(es.getEventTime(), <strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">double</strong>[0]);
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>
-<a class="jxr_linenumber" name="L86" href="#L86">86</a> interpolator.shift();
-<a class="jxr_linenumber" name="L87" href="#L87">87</a> interpolator.storeTime(r2 + 0.4 * gap);
-<a class="jxr_linenumber" name="L88" href="#L88">88</a> Assert.assertTrue(es.evaluateStep(interpolator));
-<a class="jxr_linenumber" name="L89" href="#L89">89</a> Assert.assertEquals(r2, es.getEventTime(), tolerance);
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>
-<a class="jxr_linenumber" name="L91" href="#L91">91</a> }
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>
-<a class="jxr_linenumber" name="L93" href="#L93">93</a> <em class="jxr_comment">// Jira: MATH-695</em>
-<a class="jxr_linenumber" name="L94" href="#L94">94</a> @Test
-<a class="jxr_linenumber" name="L95" href="#L95">95</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testIssue695()
-<a class="jxr_linenumber" name="L96" href="#L96">96</a> <strong class="jxr_keyword">throws</strong> DimensionMismatchException, NumberIsTooSmallException,
-<a class="jxr_linenumber" name="L97" href="#L97">97</a> MaxCountExceededException, NoBracketingException {
+<a class="jxr_linenumber" name="L80" href="#L80">80</a> }
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>
+<a class="jxr_linenumber" name="L82" href="#L82">82</a> <em class="jxr_comment">// Jira: MATH-695</em>
+<a class="jxr_linenumber" name="L83" href="#L83">83</a> @Test
+<a class="jxr_linenumber" name="L84" href="#L84">84</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testIssue695()
+<a class="jxr_linenumber" name="L85" href="#L85">85</a> <strong class="jxr_keyword">throws</strong> DimensionMismatchException, NumberIsTooSmallException,
+<a class="jxr_linenumber" name="L86" href="#L86">86</a> MaxCountExceededException, NoBracketingException {
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>
+<a class="jxr_linenumber" name="L88" href="#L88">88</a> FirstOrderDifferentialEquations equation = <strong class="jxr_keyword">new</strong> FirstOrderDifferentialEquations() {
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>
+<a class="jxr_linenumber" name="L90" href="#L90">90</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getDimension() {
+<a class="jxr_linenumber" name="L91" href="#L91">91</a> <strong class="jxr_keyword">return</strong> 1;
+<a class="jxr_linenumber" name="L92" href="#L92">92</a> }
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>
+<a class="jxr_linenumber" name="L94" href="#L94">94</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> computeDerivatives(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y, <strong class="jxr_keyword">double</strong>[] yDot) {
+<a class="jxr_linenumber" name="L95" href="#L95">95</a> yDot[0] = 1.0;
+<a class="jxr_linenumber" name="L96" href="#L96">96</a> }
+<a class="jxr_linenumber" name="L97" href="#L97">97</a> };
<a class="jxr_linenumber" name="L98" href="#L98">98</a>
-<a class="jxr_linenumber" name="L99" href="#L99">99</a> FirstOrderDifferentialEquations equation = <strong class="jxr_keyword">new</strong> FirstOrderDifferentialEquations() {
-<a class="jxr_linenumber" name="L100" href="#L100">100</a>
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getDimension() {
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> <strong class="jxr_keyword">return</strong> 1;
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> }
-<a class="jxr_linenumber" name="L104" href="#L104">104</a>
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> computeDerivatives(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y, <strong class="jxr_keyword">double</strong>[] yDot) {
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> yDot[0] = 1.0;
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> }
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> };
+<a class="jxr_linenumber" name="L99" href="#L99">99</a> DormandPrince853Integrator integrator = <strong class="jxr_keyword">new</strong> DormandPrince853Integrator(0.001, 1000, 1.0e-14, 1.0e-14);
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> integrator.addEventHandler(<strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/math3/ode/events/EventStateTest.html">ResettingEvent</a>(10.99), 0.1, 1.0e-9, 1000);
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> integrator.addEventHandler(<strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/math3/ode/events/EventStateTest.html">ResettingEvent</a>(11.01), 0.1, 1.0e-9, 1000);
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> integrator.setInitialStepSize(3.0);
+<a class="jxr_linenumber" name="L103" href="#L103">103</a>
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> <strong class="jxr_keyword">double</strong> target = 30.0;
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> <strong class="jxr_keyword">double</strong>[] y = <strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">double</strong>[1];
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> <strong class="jxr_keyword">double</strong> tEnd = integrator.integrate(equation, 0.0, y, target, y);
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> Assert.assertEquals(target, tEnd, 1.0e-10);
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> Assert.assertEquals(32.0, y[0], 1.0e-10);
<a class="jxr_linenumber" name="L109" href="#L109">109</a>
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> DormandPrince853Integrator integrator = <strong class="jxr_keyword">new</strong> DormandPrince853Integrator(0.001, 1000, 1.0e-14, 1.0e-14);
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> integrator.addEventHandler(<strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/math3/ode/events/EventStateTest.html">ResettingEvent</a>(10.99), 0.1, 1.0e-9, 1000);
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> integrator.addEventHandler(<strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/math3/ode/events/EventStateTest.html">ResettingEvent</a>(11.01), 0.1, 1.0e-9, 1000);
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> integrator.setInitialStepSize(3.0);
-<a class="jxr_linenumber" name="L114" href="#L114">114</a>
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> <strong class="jxr_keyword">double</strong> target = 30.0;
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> <strong class="jxr_keyword">double</strong>[] y = <strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">double</strong>[1];
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> <strong class="jxr_keyword">double</strong> tEnd = integrator.integrate(equation, 0.0, y, target, y);
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> Assert.assertEquals(target, tEnd, 1.0e-10);
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> Assert.assertEquals(32.0, y[0], 1.0e-10);
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> }
+<a class="jxr_linenumber" name="L111" href="#L111">111</a>
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/commons/math3/ode/events/EventStateTest.html">ResettingEvent</a> <strong class="jxr_keyword">implements</strong> EventHandler {
+<a class="jxr_linenumber" name="L113" href="#L113">113</a>
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">double</strong> lastTriggerTime = Double.NEGATIVE_INFINITY;
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> tEvent;
+<a class="jxr_linenumber" name="L116" href="#L116">116</a>
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/math3/ode/events/EventStateTest.html">ResettingEvent</a>(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> tEvent) {
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> <strong class="jxr_keyword">this</strong>.tEvent = tEvent;
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> }
<a class="jxr_linenumber" name="L120" href="#L120">120</a>
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> }
-<a class="jxr_linenumber" name="L122" href="#L122">122</a>
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/commons/math3/ode/events/EventStateTest.html">ResettingEvent</a> <strong class="jxr_keyword">implements</strong> EventHandler {
-<a class="jxr_linenumber" name="L124" href="#L124">124</a>
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">double</strong> lastTriggerTime = Double.NEGATIVE_INFINITY;
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> tEvent;
-<a class="jxr_linenumber" name="L127" href="#L127">127</a>
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/math3/ode/events/EventStateTest.html">ResettingEvent</a>(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> tEvent) {
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> <strong class="jxr_keyword">this</strong>.tEvent = tEvent;
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> }
-<a class="jxr_linenumber" name="L131" href="#L131">131</a>
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> init(<strong class="jxr_keyword">double</strong> t0, <strong class="jxr_keyword">double</strong>[] y0, <strong class="jxr_keyword">double</strong> t) {
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> }
-<a class="jxr_linenumber" name="L134" href="#L134">134</a>
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">double</strong> g(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y) {
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> <em class="jxr_comment">// the bug corresponding to issue 695 causes the g function</em>
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> <em class="jxr_comment">// to be called at obsolete times t despite an event</em>
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> <em class="jxr_comment">// occurring later has already been triggered.</em>
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> <em class="jxr_comment">// When this occurs, the following assertion is violated</em>
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> Assert.assertTrue(<span class="jxr_string">"going backard in time! ("</span> + t + <span class="jxr_string">" < "</span> + lastTriggerTime + <span class="jxr_string">")"</span>,
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> t >= lastTriggerTime);
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> <strong class="jxr_keyword">return</strong> t - tEvent;
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> }
-<a class="jxr_linenumber" name="L144" href="#L144">144</a>
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> <strong class="jxr_keyword">public</strong> Action eventOccurred(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y, <strong class="jxr_keyword">boolean</strong> increasing) {
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> <em class="jxr_comment">// remember in a class variable when the event was triggered</em>
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> lastTriggerTime = t;
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> <strong class="jxr_keyword">return</strong> Action.RESET_STATE;
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> }
-<a class="jxr_linenumber" name="L150" href="#L150">150</a>
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> resetState(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y) {
-<a class="jxr_linenumber" name="L152" href="#L152">152</a> y[0] += 1.0;
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> }
-<a class="jxr_linenumber" name="L154" href="#L154">154</a>
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> }
-<a class="jxr_linenumber" name="L156" href="#L156">156</a>
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> <em class="jxr_comment">// Jira: MATH-965</em>
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> @Test
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testIssue965()
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> <strong class="jxr_keyword">throws</strong> DimensionMismatchException, NumberIsTooSmallException,
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> MaxCountExceededException, NoBracketingException {
-<a class="jxr_linenumber" name="L162" href="#L162">162</a>
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> ExpandableStatefulODE equation =
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> <strong class="jxr_keyword">new</strong> ExpandableStatefulODE(<strong class="jxr_keyword">new</strong> FirstOrderDifferentialEquations() {
-<a class="jxr_linenumber" name="L165" href="#L165">165</a>
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getDimension() {
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> <strong class="jxr_keyword">return</strong> 1;
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> }
-<a class="jxr_linenumber" name="L169" href="#L169">169</a>
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> computeDerivatives(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y, <strong class="jxr_keyword">double</strong>[] yDot) {
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> yDot[0] = 2.0;
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> }
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> });
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> equation.setTime(0.0);
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> equation.setPrimaryState(<strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">double</strong>[1]);
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> equation.addSecondaryEquations(<strong class="jxr_keyword">new</strong> SecondaryEquations() {
-<a class="jxr_linenumber" name="L177" href="#L177">177</a>
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getDimension() {
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> <strong class="jxr_keyword">return</strong> 1;
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> }
-<a class="jxr_linenumber" name="L181" href="#L181">181</a>
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> computeDerivatives(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] primary,
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> <strong class="jxr_keyword">double</strong>[] primaryDot, <strong class="jxr_keyword">double</strong>[] secondary,
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> <strong class="jxr_keyword">double</strong>[] secondaryDot) {
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> secondaryDot[0] = -3.0;
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> }
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> });
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> <strong class="jxr_keyword">int</strong> index = equation.getSecondaryMappers()[0].getFirstIndex();
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> init(<strong class="jxr_keyword">double</strong> t0, <strong class="jxr_keyword">double</strong>[] y0, <strong class="jxr_keyword">double</strong> t) {
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> }
+<a class="jxr_linenumber" name="L123" href="#L123">123</a>
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">double</strong> g(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y) {
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> <em class="jxr_comment">// the bug corresponding to issue 695 causes the g function</em>
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> <em class="jxr_comment">// to be called at obsolete times t despite an event</em>
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> <em class="jxr_comment">// occurring later has already been triggered.</em>
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> <em class="jxr_comment">// When this occurs, the following assertion is violated</em>
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> Assert.assertTrue(<span class="jxr_string">"going backard in time! ("</span> + t + <span class="jxr_string">" < "</span> + lastTriggerTime + <span class="jxr_string">")"</span>,
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> t >= lastTriggerTime);
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> <strong class="jxr_keyword">return</strong> t - tEvent;
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> }
+<a class="jxr_linenumber" name="L133" href="#L133">133</a>
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> <strong class="jxr_keyword">public</strong> Action eventOccurred(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y, <strong class="jxr_keyword">boolean</strong> increasing) {
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> <em class="jxr_comment">// remember in a class variable when the event was triggered</em>
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> lastTriggerTime = t;
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> <strong class="jxr_keyword">return</strong> Action.RESET_STATE;
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> }
+<a class="jxr_linenumber" name="L139" href="#L139">139</a>
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> resetState(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y) {
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> y[0] += 1.0;
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> }
+<a class="jxr_linenumber" name="L143" href="#L143">143</a>
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> }
+<a class="jxr_linenumber" name="L145" href="#L145">145</a>
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> <em class="jxr_comment">// Jira: MATH-965</em>
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> @Test
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testIssue965()
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> <strong class="jxr_keyword">throws</strong> DimensionMismatchException, NumberIsTooSmallException,
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> MaxCountExceededException, NoBracketingException {
+<a class="jxr_linenumber" name="L151" href="#L151">151</a>
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> ExpandableStatefulODE equation =
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> <strong class="jxr_keyword">new</strong> ExpandableStatefulODE(<strong class="jxr_keyword">new</strong> FirstOrderDifferentialEquations() {
+<a class="jxr_linenumber" name="L154" href="#L154">154</a>
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getDimension() {
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> <strong class="jxr_keyword">return</strong> 1;
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> }
+<a class="jxr_linenumber" name="L158" href="#L158">158</a>
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> computeDerivatives(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y, <strong class="jxr_keyword">double</strong>[] yDot) {
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> yDot[0] = 2.0;
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> }
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> });
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> equation.setTime(0.0);
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> equation.setPrimaryState(<strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">double</strong>[1]);
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> equation.addSecondaryEquations(<strong class="jxr_keyword">new</strong> SecondaryEquations() {
+<a class="jxr_linenumber" name="L166" href="#L166">166</a>
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getDimension() {
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> <strong class="jxr_keyword">return</strong> 1;
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> }
+<a class="jxr_linenumber" name="L170" href="#L170">170</a>
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> computeDerivatives(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] primary,
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> <strong class="jxr_keyword">double</strong>[] primaryDot, <strong class="jxr_keyword">double</strong>[] secondary,
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> <strong class="jxr_keyword">double</strong>[] secondaryDot) {
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> secondaryDot[0] = -3.0;
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> }
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> });
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> <strong class="jxr_keyword">int</strong> index = equation.getSecondaryMappers()[0].getFirstIndex();
+<a class="jxr_linenumber" name="L178" href="#L178">178</a>
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> DormandPrince853Integrator integrator = <strong class="jxr_keyword">new</strong> DormandPrince853Integrator(0.001, 1000, 1.0e-14, 1.0e-14);
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> integrator.addEventHandler(<strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/math3/ode/events/EventStateTest.html">SecondaryStateEvent</a>(index, -3.0), 0.1, 1.0e-9, 1000);
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> integrator.setInitialStepSize(3.0);
+<a class="jxr_linenumber" name="L182" href="#L182">182</a>
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> integrator.integrate(equation, 30.0);
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> Assert.assertEquals( 1.0, equation.getTime(), 1.0e-10);
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> Assert.assertEquals( 2.0, equation.getPrimaryState()[0], 1.0e-10);
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> Assert.assertEquals(-3.0, equation.getSecondaryState(0)[0], 1.0e-10);
+<a class="jxr_linenumber" name="L187" href="#L187">187</a>
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> }
<a class="jxr_linenumber" name="L189" href="#L189">189</a>
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> DormandPrince853Integrator integrator = <strong class="jxr_keyword">new</strong> DormandPrince853Integrator(0.001, 1000, 1.0e-14, 1.0e-14);
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> integrator.addEventHandler(<strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/math3/ode/events/EventStateTest.html">SecondaryStateEvent</a>(index, -3.0), 0.1, 1.0e-9, 1000);
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> integrator.setInitialStepSize(3.0);
-<a class="jxr_linenumber" name="L193" href="#L193">193</a>
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> integrator.integrate(equation, 30.0);
-<a class="jxr_linenumber" name="L195" href="#L195">195</a> Assert.assertEquals( 1.0, equation.getTime(), 1.0e-10);
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> Assert.assertEquals( 2.0, equation.getPrimaryState()[0], 1.0e-10);
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> Assert.assertEquals(-3.0, equation.getSecondaryState(0)[0], 1.0e-10);
-<a class="jxr_linenumber" name="L198" href="#L198">198</a>
-<a class="jxr_linenumber" name="L199" href="#L199">199</a> }
-<a class="jxr_linenumber" name="L200" href="#L200">200</a>
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/commons/math3/ode/events/EventStateTest.html">SecondaryStateEvent</a> <strong class="jxr_keyword">implements</strong> EventHandler {
+<a class="jxr_linenumber" name="L190" href="#L190">190</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/commons/math3/ode/events/EventStateTest.html">SecondaryStateEvent</a> <strong class="jxr_keyword">implements</strong> EventHandler {
+<a class="jxr_linenumber" name="L191" href="#L191">191</a>
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> index;
+<a class="jxr_linenumber" name="L193" href="#L193">193</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> target;
+<a class="jxr_linenumber" name="L194" href="#L194">194</a>
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/math3/ode/events/EventStateTest.html">SecondaryStateEvent</a>(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> index, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> target) {
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> <strong class="jxr_keyword">this</strong>.index = index;
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> <strong class="jxr_keyword">this</strong>.target = target;
+<a class="jxr_linenumber" name="L198" href="#L198">198</a> }
+<a class="jxr_linenumber" name="L199" href="#L199">199</a>
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> init(<strong class="jxr_keyword">double</strong> t0, <strong class="jxr_keyword">double</strong>[] y0, <strong class="jxr_keyword">double</strong> t) {
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> }
<a class="jxr_linenumber" name="L202" href="#L202">202</a>
-<a class="jxr_linenumber" name="L203" href="#L203">203</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> index;
-<a class="jxr_linenumber" name="L204" href="#L204">204</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> target;
-<a class="jxr_linenumber" name="L205" href="#L205">205</a>
-<a class="jxr_linenumber" name="L206" href="#L206">206</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/math3/ode/events/EventStateTest.html">SecondaryStateEvent</a>(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> index, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> target) {
-<a class="jxr_linenumber" name="L207" href="#L207">207</a> <strong class="jxr_keyword">this</strong>.index = index;
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> <strong class="jxr_keyword">this</strong>.target = target;
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">double</strong> g(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y) {
+<a class="jxr_linenumber" name="L204" href="#L204">204</a> <strong class="jxr_keyword">return</strong> y[index] - target;
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> }
+<a class="jxr_linenumber" name="L206" href="#L206">206</a>
+<a class="jxr_linenumber" name="L207" href="#L207">207</a> <strong class="jxr_keyword">public</strong> Action eventOccurred(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y, <strong class="jxr_keyword">boolean</strong> increasing) {
+<a class="jxr_linenumber" name="L208" href="#L208">208</a> <strong class="jxr_keyword">return</strong> Action.STOP;
<a class="jxr_linenumber" name="L209" href="#L209">209</a> }
<a class="jxr_linenumber" name="L210" href="#L210">210</a>
-<a class="jxr_linenumber" name="L211" href="#L211">211</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> init(<strong class="jxr_keyword">double</strong> t0, <strong class="jxr_keyword">double</strong>[] y0, <strong class="jxr_keyword">double</strong> t) {
+<a class="jxr_linenumber" name="L211" href="#L211">211</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> resetState(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y) {
<a class="jxr_linenumber" name="L212" href="#L212">212</a> }
<a class="jxr_linenumber" name="L213" href="#L213">213</a>
-<a class="jxr_linenumber" name="L214" href="#L214">214</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">double</strong> g(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y) {
-<a class="jxr_linenumber" name="L215" href="#L215">215</a> <strong class="jxr_keyword">return</strong> y[index] - target;
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> }
-<a class="jxr_linenumber" name="L217" href="#L217">217</a>
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> <strong class="jxr_keyword">public</strong> Action eventOccurred(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y, <strong class="jxr_keyword">boolean</strong> increasing) {
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> <strong class="jxr_keyword">return</strong> Action.STOP;
-<a class="jxr_linenumber" name="L220" href="#L220">220</a> }
-<a class="jxr_linenumber" name="L221" href="#L221">221</a>
-<a class="jxr_linenumber" name="L222" href="#L222">222</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> resetState(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y) {
-<a class="jxr_linenumber" name="L223" href="#L223">223</a> }
-<a class="jxr_linenumber" name="L224" href="#L224">224</a>
-<a class="jxr_linenumber" name="L225" href="#L225">225</a> }
-<a class="jxr_linenumber" name="L226" href="#L226">226</a>
-<a class="jxr_linenumber" name="L227" href="#L227">227</a> }
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> }
+<a class="jxr_linenumber" name="L215" href="#L215">215</a>
+<a class="jxr_linenumber" name="L216" href="#L216">216</a> @Test
+<a class="jxr_linenumber" name="L217" href="#L217">217</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testEventsCloserThanThreshold()
+<a class="jxr_linenumber" name="L218" href="#L218">218</a> <strong class="jxr_keyword">throws</strong> DimensionMismatchException, NumberIsTooSmallException,
+<a class="jxr_linenumber" name="L219" href="#L219">219</a> MaxCountExceededException, NoBracketingException {
+<a class="jxr_linenumber" name="L220" href="#L220">220</a>
+<a class="jxr_linenumber" name="L221" href="#L221">221</a> FirstOrderDifferentialEquations equation = <strong class="jxr_keyword">new</strong> FirstOrderDifferentialEquations() {
+<a class="jxr_linenumber" name="L222" href="#L222">222</a>
+<a class="jxr_linenumber" name="L223" href="#L223">223</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getDimension() {
+<a class="jxr_linenumber" name="L224" href="#L224">224</a> <strong class="jxr_keyword">return</strong> 1;
+<a class="jxr_linenumber" name="L225" href="#L225">225</a> }
+<a class="jxr_linenumber" name="L226" href="#L226">226</a>
+<a class="jxr_linenumber" name="L227" href="#L227">227</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> computeDerivatives(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y, <strong class="jxr_keyword">double</strong>[] yDot) {
+<a class="jxr_linenumber" name="L228" href="#L228">228</a> yDot[0] = 1.0;
+<a class="jxr_linenumber" name="L229" href="#L229">229</a> }
+<a class="jxr_linenumber" name="L230" href="#L230">230</a> };
+<a class="jxr_linenumber" name="L231" href="#L231">231</a>
+<a class="jxr_linenumber" name="L232" href="#L232">232</a> LutherIntegrator integrator = <strong class="jxr_keyword">new</strong> LutherIntegrator(20.0);
+<a class="jxr_linenumber" name="L233" href="#L233">233</a> <a href="../../../../../../org/apache/commons/math3/ode/events/EventStateTest.html">CloseEventsGenerator</a> eventsGenerator =
+<a class="jxr_linenumber" name="L234" href="#L234">234</a> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/commons/math3/ode/events/EventStateTest.html">CloseEventsGenerator</a>(9.0 - 1.0 / 128, 9.0 + 1.0 / 128);
+<a class="jxr_linenumber" name="L235" href="#L235">235</a> integrator.addEventHandler(eventsGenerator, 1.0, 0.02, 1000);
+<a class="jxr_linenumber" name="L236" href="#L236">236</a> <strong class="jxr_keyword">double</strong>[] y = <strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">double</strong>[1];
+<a class="jxr_linenumber" name="L237" href="#L237">237</a> <strong class="jxr_keyword">double</strong> tEnd = integrator.integrate(equation, 0.0, y, 100.0, y);
+<a class="jxr_linenumber" name="L238" href="#L238">238</a> Assert.assertEquals( 2, eventsGenerator.getCount());
+<a class="jxr_linenumber" name="L239" href="#L239">239</a> Assert.assertEquals( 9.0 + 1.0 / 128, tEnd, 1.0 / 32.0);
+<a class="jxr_linenumber" name="L240" href="#L240">240</a>
+<a class="jxr_linenumber" name="L241" href="#L241">241</a> }
+<a class="jxr_linenumber" name="L242" href="#L242">242</a>
+<a class="jxr_linenumber" name="L243" href="#L243">243</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/commons/math3/ode/events/EventStateTest.html">CloseEventsGenerator</a> <strong class="jxr_keyword">implements</strong> EventHandler {
+<a class="jxr_linenumber" name="L244" href="#L244">244</a>
+<a class="jxr_linenumber" name="L245" href="#L245">245</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> r1;
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> r2;
+<a class="jxr_linenumber" name="L247" href="#L247">247</a> <strong class="jxr_keyword">int</strong> count;
+<a class="jxr_linenumber" name="L248" href="#L248">248</a>
+<a class="jxr_linenumber" name="L249" href="#L249">249</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/commons/math3/ode/events/EventStateTest.html">CloseEventsGenerator</a>(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> r1, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">double</strong> r2) {
+<a class="jxr_linenumber" name="L250" href="#L250">250</a> <strong class="jxr_keyword">this</strong>.r1 = r1;
+<a class="jxr_linenumber" name="L251" href="#L251">251</a> <strong class="jxr_keyword">this</strong>.r2 = r2;
+<a class="jxr_linenumber" name="L252" href="#L252">252</a> <strong class="jxr_keyword">this</strong>.count = 0;
+<a class="jxr_linenumber" name="L253" href="#L253">253</a> }
+<a class="jxr_linenumber" name="L254" href="#L254">254</a>
+<a class="jxr_linenumber" name="L255" href="#L255">255</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> init(<strong class="jxr_keyword">double</strong> t0, <strong class="jxr_keyword">double</strong>[] y0, <strong class="jxr_keyword">double</strong> t) {
+<a class="jxr_linenumber" name="L256" href="#L256">256</a> }
+<a class="jxr_linenumber" name="L257" href="#L257">257</a>
+<a class="jxr_linenumber" name="L258" href="#L258">258</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> resetState(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y) {
+<a class="jxr_linenumber" name="L259" href="#L259">259</a> }
+<a class="jxr_linenumber" name="L260" href="#L260">260</a>
+<a class="jxr_linenumber" name="L261" href="#L261">261</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">double</strong> g(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y) {
+<a class="jxr_linenumber" name="L262" href="#L262">262</a> <strong class="jxr_keyword">return</strong> (t - r1) * (r2 - t);
+<a class="jxr_linenumber" name="L263" href="#L263">263</a> }
+<a class="jxr_linenumber" name="L264" href="#L264">264</a>
+<a class="jxr_linenumber" name="L265" href="#L265">265</a> <strong class="jxr_keyword">public</strong> Action eventOccurred(<strong class="jxr_keyword">double</strong> t, <strong class="jxr_keyword">double</strong>[] y, <strong class="jxr_keyword">boolean</strong> increasing) {
+<a class="jxr_linenumber" name="L266" href="#L266">266</a> <strong class="jxr_keyword">return</strong> ++count < 2 ? Action.CONTINUE : Action.STOP;
+<a class="jxr_linenumber" name="L267" href="#L267">267</a> }
+<a class="jxr_linenumber" name="L268" href="#L268">268</a>
+<a class="jxr_linenumber" name="L269" href="#L269">269</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getCount() {
+<a class="jxr_linenumber" name="L270" href="#L270">270</a> <strong class="jxr_keyword">return</strong> count;
+<a class="jxr_linenumber" name="L271" href="#L271">271</a> }
+<a class="jxr_linenumber" name="L272" href="#L272">272</a>
+<a class="jxr_linenumber" name="L273" href="#L273">273</a> }
+<a class="jxr_linenumber" name="L274" href="#L274">274</a>
+<a class="jxr_linenumber" name="L275" href="#L275">275</a> }
</pre>
<hr/>
<div id="footer">Copyright © 2003–2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
Modified: websites/production/commons/content/proper/commons-math/xref-test/org/apache/commons/math3/ode/events/package-frame.html
==============================================================================
--- websites/production/commons/content/proper/commons-math/xref-test/org/apache/commons/math3/ode/events/package-frame.html (original)
+++ websites/production/commons/content/proper/commons-math/xref-test/org/apache/commons/math3/ode/events/package-frame.html Mon Jul 27 19:42:09 2015
@@ -16,6 +16,9 @@
<ul>
<li>
+ <a href="EventStateTest.html" target="classFrame">CloseEventsGenerator</a>
+ </li>
+ <li>
<a href="ReappearingEventTest.html" target="classFrame">Event</a>
</li>
<li>
Modified: websites/production/commons/content/proper/commons-math/xref-test/org/apache/commons/math3/ode/events/package-summary.html
==============================================================================
--- websites/production/commons/content/proper/commons-math/xref-test/org/apache/commons/math3/ode/events/package-summary.html (original)
+++ websites/production/commons/content/proper/commons-math/xref-test/org/apache/commons/math3/ode/events/package-summary.html Mon Jul 27 19:42:09 2015
@@ -37,6 +37,11 @@
<tbody>
<tr>
<td>
+ <a href="EventStateTest.html" target="classFrame">CloseEventsGenerator</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
<a href="ReappearingEventTest.html" target="classFrame">Event</a>
</td>
</tr>