Correct bug in previous commit

Author: BenLauwens

src/base.jl

@@ -1,7 +1,7 @@
 abstract type AbstractEvent end
 abstract type Environment end
 
-@enum EVENT_STATE idle=0 scheduled=1 triggered=2 processed=3
+@enum EVENT_STATE idle=0 scheduled=1 processed=2
 
 struct EventProcessed <: Exception
   ev :: AbstractEvent
@@ -61,6 +61,7 @@ function remove_callback(cb::Function, ev::AbstractEvent)
 end
 
 function schedule(ev::AbstractEvent, delay::Number=zero(Float64); priority::Int8=zero(Int8), value::Any=nothing)
+  state(ev) == processed && throw(EventProcessed(ev))
   env = environment(ev)
   bev = ev.bev
   bev.value = value

src/operators.jl

@@ -40,11 +40,11 @@ function check(ev::AbstractEvent, op::Operator, event_state_values::Dict{Abstrac
 end
 
 function eval_and(state_values::Vector{StateValue})
-  all(map((sv)->sv.state >= triggered, state_values))
+  all(map((sv)->sv.state == processed, state_values))
 end
 
 function eval_or(state_values::Vector{StateValue})
-  any(map((sv)->sv.state >= triggered, state_values))
+  any(map((sv)->sv.state == processed, state_values))
 end
 
 function (&)(ev1::AbstractEvent, ev2::AbstractEvent)

src/simulations.jl

@@ -34,12 +34,10 @@ function step(sim::Simulation)
   (bev, key) = DataStructures.peek(sim.heap)
   DataStructures.dequeue!(sim.heap)
   sim.time = key.time
-  bev.state = triggered
+  bev.state = processed
   for callback in bev.callbacks
     callback()
   end
-  bev.state = processed
-  nothing
 end
 
 function now(sim::Simulation)