Inital commit of step

Author: BenLauwens

src/SimJulia.jl

@@ -28,7 +28,7 @@ module SimJulia
   export Coroutine, @coroutine
   export Container, Resource, Store
   export Put, Get, Request, Release, cancel, capacity, request, @request
-  export Continuous
+  export Continuous, Variable
   export @model, @continuous
 
   include("base.jl")
@@ -49,5 +49,6 @@ module SimJulia
   include("odes/macros.jl")
   include("odes/QSS.jl")
   include("continuous.jl")
+  include("odes/utils.jl")
   include("odes/commons.jl")
 end

src/odes/QSS.jl

@@ -6,11 +6,12 @@ struct ImplicitQuantizer <: Quantizer end
 
 struct QSS <: Integrator
   order :: UInt8
+  deps :: Matrix{Bool}
   quantizer :: Quantizer
   q :: Vector{Taylor1}
   t :: Vector{Float64}
   function QSS(;order::Number=4, stiff::Bool=false)
     quantizer = stiff ? ImplicitQuantizer() : DirectQuantizer()
-    new(UInt8(order), quantizer, Vector{Taylor1}(), Vector{Float64}())
+    new(UInt8(order), Matrix{Bool}(0, 0), quantizer, Vector{Taylor1}(), Vector{Float64}())
   end
 end

src/odes/commons.jl

@@ -32,5 +32,10 @@ function step(var::Variable, cont::Continuous, integrator::QSS)
   i = var.id
   env = environment(var)
   t = now(env)
-  println(integrator.q)
+  x₀ = advance_time(var, t)
+  #update_quantized_state(cont, integrator, i)
+  #for (j, istrue) in enumerate(integrator.deps[i, :])
+  #  istrue && advance_time(cont, j, t)
+  #end
+  q₋ = deepcopy(integrator.q)
 end

src/odes/macros.jl

@@ -1,10 +1,10 @@
-function check_dependencies(ex, deps::Array{Bool}, i::Int)
+function check_dependencies(ex, deps::Array{Bool}, i::Int, x::Symbol)
   if ex isa Expr
-    if ex.head == :ref
+    if ex.head == :ref && x == ex.args[1]
       deps[i, ex.args[2]] = true
     else
       for arg in ex.args
-        check_dependencies(arg, deps, i)
+        check_dependencies(arg, deps, i, x)
       end
     end
   end
@@ -21,9 +21,7 @@ macro model(expr::Expr)
   n = length(f_vec)
   deps = zeros(Bool, n, n)
   for ex in expr.args[2].args
-    if ex isa Expr && ex.head == Symbol("=")
-      check_dependencies(ex.args[2], deps, ex.args[1].args[2])
-    end
+    ex isa Expr && ex.head == Symbol("=") && check_dependencies(ex.args[2], deps, ex.args[1].args[2], expr.args[1].args[3])
   end
   esc(:(function $func_name()
       f = Array{Function}(length($f_vec))

src/odes/utils.jl

@@ -0,0 +1,15 @@
+function advance_time(var::Variable, t::Float64)
+  x = var.x
+  Δt = t - var.t
+  var.x = evaluate(x, Δt + Taylor1(x.order))
+  var.t = t
+  var.x.coeffs[1]
+end
+
+function advance_time(integrator::QSS, i::Int, t::Float64)
+  q = integrator.q[i]
+  Δt = t - integrator.t[i]
+  integrator.q[i] = evaluate(q, Δt + Taylor1(q.order))
+  integrator.t[i] = t
+  integrator.q[i].coeffs[1]
+end