# HG changeset patch
# User Rik <rik@octave.org>
# Date 1608249503 28800
# Node ID 01e5c00a860985fd4a5617745fdc606419b99103
# Parent  547fc7f033dab7efe6c25117e84d7dd8a8e5f54a# Parent  b2d5ee958d7fff68a677679d44270fc5f8edca70
maint: merge stable to default.

diff -r 547fc7f033da -r 01e5c00a8609 scripts/ode/private/ode_event_handler.m
--- a/scripts/ode/private/ode_event_handler.m	Thu Dec 17 14:24:15 2020 -0800
+++ b/scripts/ode/private/ode_event_handler.m	Thu Dec 17 15:58:23 2020 -0800
@@ -101,18 +101,10 @@
     ## Check if one or more signs of the event has changed
     signum = (sign (evtold) != sign (evt));
     if (any (signum))         # One or more values have changed
-      idx = find (signum);    # Get the index of the changed values
-
-      if (any (dir(idx) == 0))
-        ## Rising or falling (both are possible)
-        ## Don't change anything, keep the index
-      elseif (any (dir(idx) == sign (evt(idx))))
-        ## Detected rising or falling, need a new index
-        idx = find (dir == sign (evt));
-      else
-        ## Found a zero crossing but must not be notified
-        idx = [];
-      endif
+      ## Find events where either rising and falling edges are counted (dir==0)
+      ## or where the specified edge type matches the event edge type.
+      idx = signum & (dir == 0 | dir == sign (evt));
+      idx = find (idx);  # convert logical to numeric index or []
 
       ## Create new output values if a valid index has been found
       if (! isempty (idx))
@@ -123,11 +115,12 @@
         else
           retcell{1} = any (term(idx));     # Stop integration or not
         endif
-        retcell{2}(evtcnt,1) = idx(1,1);  # Take first event found
+        idx = idx(1);  # Use first event found if there are multiple.
+        retcell{2}(evtcnt,1) = idx;
         ## Calculate the time stamp when the event function returned 0 and
         ## calculate new values for the integration results, we do both by
-        ## a linear interpolation
-        tnew = t - evt(1,idx) * (t - told) / (evt(1,idx) - evtold(1,idx));
+        ## a linear interpolation.
+        tnew = t - evt(idx) * (t - told) / (evt(idx) - evtold(idx));
         ynew = (y - (t - tnew) * (y - yold) / (t - told)).';
         retcell{3}(evtcnt,1) = tnew;
         retcell{4}(evtcnt,:) = ynew;