Introduce Handler

Author: BenLauwens

src/SimJulia.jl

@@ -28,8 +28,8 @@ module SimJulia
   export Coroutine, @coroutine
   export Container, Resource, Store
   export Put, Get, Request, Release, cancel, capacity, request, @request
-  export Model, Continuous, Variable, ZeroCrossing
-  export @model, @continuous, @trigger, @zerocrossing
+  export Model, Continuous, Variable
+  export @model, @continuous
   export evaluate
   export QSS
   export non_stiff, stiff

src/continuous.jl

@@ -18,14 +18,13 @@ function evaluate(var::Variable, t::Float64=now(environment(var)))
   evaluate(var.x, t - var.t)
 end
 
-struct ZeroCrossing <: AbstractEvent
-
+struct Handler <: AbstractEvent
+  bev :: BaseEvent
+  function(env::Environment)
+    new(BaseEvent(env))
+  end
 end
 
-macro trigger(expr::Expr)
-  expr.head != :call && error("Expression is not a function call!")
-  nothing
-end
 
 struct Continuous <: AbstractProcess
   bev :: BaseEvent

src/odes/base.jl

@@ -2,8 +2,10 @@ abstract type Integrator end
 
 struct Model
   f :: Vector{Function}
+  zc :: Vector{Function}
   deps :: Matrix{Bool}
-  function Model(f::Vector{Function}, deps::Matrix{Bool})
-    new(f, deps)
+  param_deps :: Matrix{Bool}
+  function Model(f::Vector{Function}, zc::Vector{Function}, deps::Matrix{Bool}, param_deps::Matrix{Bool})
+    new(f, zc, deps, param_deps)
   end
 end

src/odes/macros.jl

@@ -10,6 +10,19 @@ function check_dependencies(ex, deps::Array{Bool}, i::Int, x::Symbol)
   end
 end
 
+function number_parameters(ex, n::Int, p::Symbol)
+  if ex isa Expr
+    if ex.head == :ref && ex.args[1] == p
+      n = max(n, ex.args[2])
+    else
+      for arg in ex.args
+        n = max(n, number_parameters(arg, n, p))
+      end
+    end
+  end
+  n
+end
+
 macro model(expr::Expr)
   expr.head != :function && error("Expression is not a function definition!")
   args = getArguments(expr)
@@ -25,36 +38,53 @@ macro model(expr::Expr)
   for ex in expr.args[2].args
     if ex isa Expr
       if ex.head == Symbol("=")
-        if ex.args[1] isa Expr && ex.args[1].head == :ref && ex.args[1].args[1] == dx
+        if ex.args[1] isa Expr && ex.args[1].head == :ref && ex.args[1].args[1] == expr.args[1].args[5]
           push!(f_vec, ex)
+          p = max(p, number_parameters(ex.args[2], p, expr.args[1].args[4]))
         elseif ex.args[1] isa Symbol
           ex.args[2] isa Expr ? push!(a_vec, ex) : push!(c_vec, ex)
         end
       elseif ex isa Expr && ex.head == :if && ex.args[1].head == :call && ex.args[1].args[1] == :<
         push!(zc_vec, ex.args[1].args[2])
         push!(neg_vec, ex.args[2])
-        length(ex.args) == 3 ? push!(pos_vec, ex.args[3]) : Expr()
+        push!(pos_vec, ex.args[3])
       end
     end
   end
   println(zc_vec)
   println(neg_vec)
   println(pos_vec)
   n = length(f_vec)
+  m = length(zc_vec)
   deps = zeros(Bool, n, n)
   param_deps = zeros(Bool, n, p)
-  zc_deps = zeros(Bool, p, n)
-  for ex in expr.args[2].args
-    ex isa Expr && ex.head == Symbol("=") && ex.args[1] isa Expr && ex.args[1].head == :ref && ex.args[1].args[1] == dx && check_dependencies(ex.args[2], deps, ex.args[1].args[2], expr.args[1].args[3])
+  zc_deps = zeros(Bool, m, n)
+  rev_zc_deps = zeros(Bool, n, m)
+  for ex in f_vec
+    check_dependencies(ex.args[2], deps, ex.args[1].args[2], expr.args[1].args[3])
+    check_dependencies(ex.args[2], param_deps, ex.args[1].args[2], expr.args[1].args[4])
+  end
+  for (i, ex) in enumerate(zc_vec)
+    check_dependencies(ex, zc_deps, i, expr.args[1].args[3])
   end
+  println(deps)
+  println(param_deps)
+  println(zc_deps)
   esc(:(function $func_name()
       f = Array{Function}($n)
       $((:(f[$(f_vec[i].args[1].args[2])] = ($(expr.args[1].args[2])::TaylorSeries.Taylor1, $(expr.args[1].args[3])::Vector{TaylorSeries.Taylor1}, $(expr.args[1].args[4])::Vector{Float64})->begin
       $((:($(c)) for c in :($c_vec))...)
       $((:($(a)) for a in :($a_vec))...)
       $(f_vec[i].args[2])
       end) for i in 1:length(:($f_vec)))...)
-      Model(f, $deps)
+      zc = Vector{Function}()
+      $((:(push!(zc, ($(expr.args[1].args[2])::TaylorSeries.Taylor1, $(expr.args[1].args[3])::Vector{TaylorSeries.Taylor1}, $(expr.args[1].args[4])::Vector{Float64})->begin
+      $((:($(c)) for c in :($c_vec))...)
+      $((:($(a)) for a in :($a_vec))...)
+      $(f_vec[i].args[2])
+    end)) for i in 1:length(:($zc_vec)))...)
+      min_handler = Vector{Function}()
+      Model(f, zc, $deps, $param_deps)
     end))
 end
 

test/continuous.jl

@@ -1,7 +1,7 @@
 using SimJulia
 
 @model function diffeq(t, x, p, dx)
-  dx[1] = 0.01*x[2]
+  dx[1] = p[2]+0.01*x[2]
   dx[2] = p[1]-100.0*x[1]-100.0*x[2]
 end
 
@@ -13,7 +13,7 @@ function report(sim::Simulation, cont::Continuous)
 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, 0.0]; stiff=false, order=4)
 @process report(sim, cont)
 run(sim, 71)