QSS direct implemented

Author: BenLauwens

src/SimJulia.jl

@@ -11,7 +11,7 @@ module SimJulia
 
   import Base.run, Base.now, Base.isless, Base.show, Base.interrupt, Base.yield
   import Base.(&), Base.(|)
-  import TaylorSeries.integrate
+  import TaylorSeries.integrate, TaylorSeries.evaluate
 
   export AbstractEvent
   export value, state, environment
@@ -30,6 +30,7 @@ module SimJulia
   export Put, Get, Request, Release, cancel, capacity, request, @request
   export Model, Continuous, Variable, ZeroCrossing
   export @model, @continuous, @trigger, @zerocrossing
+  export evaluate
   export QSS
   export non_stiff, stiff
 

src/base.jl

@@ -54,7 +54,7 @@ end
 
 function remove_callback(cb::Function, ev::AbstractEvent)
   i = indexin(ev.bev.callbacks, [cb])[1]
-  deleteat!(ev.bev.callbacks, i)
+  i != 0 && deleteat!(ev.bev.callbacks, i)
 end
 
 function schedule(ev::AbstractEvent, delay::Number=zero(Float64); priority::Int8=zero(Int8), value::Any=nothing)
@@ -65,6 +65,10 @@ function schedule(ev::AbstractEvent, delay::Number=zero(Float64); priority::Int8
   bev.state = scheduled
 end
 
+function reset(ev::AbstractEvent)
+  ev.bev.state = idle
+end
+
 struct StopSimulation <: Exception
   value :: Any
   function StopSimulation(value::Any=nothing)

src/continuous.jl

@@ -14,6 +14,10 @@ function advance_time(var::Variable, t::Float64)
   var.x.coeffs[1]
 end
 
+function evaluate(var::Variable, t::Float64)
+  evaluate(var.x, t - var.t)
+end
+
 struct ZeroCrossing <: AbstractEvent
 
 end
@@ -35,7 +39,8 @@ struct Continuous <: AbstractProcess
       push!(cont.vars, Variable(env, i, x₀, t))
     end
     for var in cont.vars
-      schedule(var, cont, integrator)
+      @callback step(var, cont, integrator)
+      schedule(var)
     end
     cont
   end

src/odes/QSS.jl

@@ -46,7 +46,6 @@ function step(var::Variable, cont::Continuous, qss::QSS)
   i = var.id
   t₀ = t + Taylor1(Float64, qss.order+1)
   x₀ = advance_time(var, t)
-  println(t, " ", i, " ", x₀)
   update_quantized_state(qss, cont.vars, i, t)
   Δt = compute_next_time(var.x, max(qss.Δrel*x₀, qss.Δabs))
   schedule(var, cont, qss, Δt)

test/continuous.jl

@@ -12,13 +12,16 @@ end
   end
 end
 
+function report(sim::Simulation, cont::Continuous)
+  while true
+    t = now(sim)
+    println(t, " ", evaluate(cont.vars[1], t), " ", evaluate(cont.vars[2], t))
+    yield(Timeout(sim, 1.0))
+  end
+end
+
 sim = Simulation()
-cont = @continuous diffeq(sim, [0.0, 20.0], [2020.0]; stiff=false, order=4)
+cont = @continuous diffeq(sim, [0.0, 20.0], [2020.0]; stiff=false, order=5)
+@process report(sim, cont)
 zc = @zerocrossing less_prey(cont)
-run(sim, 10.0)
-for var in cont.vars
-  println(var.x)
-end
-for q in cont.integrator.q
-  println(q)
-end
+run(sim, 71)