Initial commit continuous and rename benchmarks

Author: BenLauwens

README.md

@@ -54,7 +54,6 @@ datetime = now()
 sim = Simulation(datetime)
 @process datetimetest(sim)
 run(sim, datetime+Month(3))
-println(nowDatetime(sim))
 ```
 * The discrete event features are on par with version 0.3. (STABLE)
 * Two ways of making `Processes` are provided:

REQUIRE

@@ -1,2 +1,3 @@
 julia 0.6
 DataStructures
+TaylorSeries

src/SimJulia.jl

@@ -7,6 +7,7 @@ module SimJulia
 
   using DataStructures
   using Base.Dates
+  using TaylorSeries
 
   import Base.run, Base.now, Base.isless, Base.show, Base.interrupt, Base.yield
   import Base.(&), Base.(|)
@@ -26,6 +27,8 @@ module SimJulia
   export Coroutine, @coroutine
   export Container, Resource, Store
   export Put, Get, Request, Release, cancel, capacity, request, @request
+  export Continuous
+  export @model, @continuous
 
   include("base.jl")
   include("events.jl")
@@ -36,10 +39,11 @@ module SimJulia
   include("processes.jl")
   include("finitestatemachines/utils.jl")
   include("finitestatemachines/transforms.jl")
-  include("finitestatemachines/macro.jl")
+  include("finitestatemachines/macros.jl")
   include("coroutines.jl")
   include("resources/base.jl")
   include("resources/containers.jl")
   include("resources/stores.jl")
-
+  include("odes/macros.jl")
+  include("continuous.jl")
 end

src/continuous.jl

@@ -0,0 +1,37 @@
+struct Continuous <: AbstractProcess
+  bev :: BaseEvent
+  f :: Vector{Function}
+  order :: UInt8
+  stiff :: Bool
+  q :: Vector{Taylor1}
+  x :: Vector{Taylor1}
+  p :: Vector{Float64}
+  function Continuous(func::Function, env::Environment, q::Vector{Float64}, p::Vector{Float64}=Float64[]; order::Number=4, stiff::Bool=false)
+    cont = new(BaseEvent(env), func(), UInt8(order), stiff, Vector{Taylor1}(), Vector{Taylor1}(), p)
+    for q₀ in q
+      push!(cont.q, q₀ + Taylor1(Float64, order+1))
+    end
+    t = now(env) + Taylor1(Float64, order+1)
+    for (i, q₀) in enumerate(q)
+      push!(cont.x, integrate(cont.f[i](t, cont.q, cont.p), q₀))
+    end
+    cont
+  end
+end
+
+macro continuous(expr::Expr)
+  expr.head != :call && error("Expression is not a function call!")
+  func = expr.args[1]
+  params = Vector{Expr}()
+  args = Vector{Any}()
+  for i in 2:length(expr.args)
+    if expr.args[i] isa Expr && expr.args[i].head == :parameters
+      for ex in expr.args[i].args
+        push!(params, ex)
+      end
+    else
+      push!(args, expr.args[i])
+    end
+  end
+  esc(:(Continuous($(func), $(args...); $(params...))))
+end

src/finitestatemachines/macro.jl src/finitestatemachines/macros.jlsrc/finitestatemachines/macro.jl renamed to src/finitestatemachines/macros.jl

@@ -7,7 +7,7 @@ abstract type FiniteStateMachine end
 iscoroutinedone(fsm::FiniteStateMachine) = fsm._state == 0xff
 
 macro stateful(expr::Expr)
-  expr.head != :function && error("Not a function definition!")
+  expr.head != :function && error("Expression is not a function definition!")
   args = getArguments(expr)
   func_name = shift!(args)
   type_name = gensym()

src/odes/macros.jl

@@ -0,0 +1,14 @@
+macro model(expr::Expr)
+  expr.head != :function && error("Expression is not a function definition!")
+  args = getArguments(expr)
+  func_name = shift!(args)
+  f_vec = Vector{Expr}()
+  for ex in expr.args[2].args
+    ex isa Expr && ex.head == Symbol("=") && push!(f_vec, ex)
+  end
+  esc(:(function $func_name()
+      f = Array{Function}(length($f_vec))
+      $((:(f[$(f_vec[i].args[1].args[2])] = (t::TaylorSeries.Taylor1, q::Vector{TaylorSeries.Taylor1}, p::Vector{Float64})->$(f_vec[i].args[2])) for i in 1:length(:($f_vec)))...)
+      f
+    end))
+end