Prepare for Julia v0.7

Author: BenLauwens

.travis.yml

@@ -3,7 +3,7 @@ os:
     - linux
     - osx
 julia:
-    - 0.6
+    - 0.7
     - nightly
 notifications:
     email: false

README.md

@@ -15,6 +15,7 @@ A discrete event process oriented simulation framework written in [Julia](http:/
 [![SimJulia](http://pkg.julialang.org/badges/SimJulia_0.4.svg)](http://pkg.julialang.org/?pkg=SimJulia&ver=0.4)
 [![SimJulia](http://pkg.julialang.org/badges/SimJulia_0.5.svg)](http://pkg.julialang.org/?pkg=SimJulia&ver=0.5)
 [![SimJulia](http://pkg.julialang.org/badges/SimJulia_0.6.svg)](http://pkg.julialang.org/?pkg=SimJulia&ver=0.6)
+[![SimJulia](http://pkg.julialang.org/badges/SimJulia_0.7.svg)](http://pkg.julialang.org/?pkg=SimJulia&ver=0.7)
 
 SimJulia.jl is a [registered package](http://pkg.julialang.org), and is installed by running
 
@@ -42,6 +43,9 @@ julia> Pkg.add("SimJulia")
 
 ## Release Notes
 
+* v0.6 (2018)
+  * adds support for Julia v0.7.
+  * the `@oldprocess` macro and the `produce` / `consume` functions are removed because they are no longer supported.
 * v0.5 (2018)
   * The old way of making processes is deprecated in favor of the semi-coroutine approach as implemented in [ResumableFunctions](https://github.com/BenLauwens/ResumableFunctions.jl.git). The `@process` macro replaces the `@coroutine` macro. The old `@process` macro is temporarily renamed `@oldprocess` and will be removed when the infrastructure supporting the `produce` and the `consume` functions is no longer available in Julia. (DONE)
   * This version no longer integrates a continuous time solver. A continuous simulation framework based on [DISCO](http://www.akira.ruc.dk/~keld/research/DISCO/) and inspired by the standalone [QSS](https://sourceforge.net/projects/qssengine/) solver using SimJulia as its discrete-event engine can be found in the repository [QuantizedStateSystems](https://github.com/BenLauwens/QuantizedStateSystems.jl.git) (WIP):
@@ -64,3 +68,4 @@ julia> Pkg.add("SimJulia")
 ## Todo
 
 * Transparent statistics gathering for resources.
+* Update of documentation.

REQUIRE

@@ -1,3 +1,3 @@
-julia 0.6 0.7-
+julia 0.7-
 DataStructures
 ResumableFunctions

VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

appveyor.yml

@@ -1,11 +1,10 @@
 environment:
   matrix:
-    - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
+    - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-win64.exe"
     - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
 
 matrix:
   allow_failures:
-  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
 
 install:

src/SimJulia.jl

@@ -6,11 +6,12 @@ Main module for SimJulia.jl – a discrete event process oriented simulation fra
 module SimJulia
 
   using DataStructures
-  using Base.Dates
+  using Dates
   using ResumableFunctions
 
-  import Base.run, Base.now, Base.isless, Base.show, Base.interrupt, Base.yield, Base.get
+  import Base.run, Base.isless, Base.show, Base.yield, Base.get
   import Base.(&), Base.(|)
+  import Dates.now
 
   export AbstractEvent, Environment, value, state, environment
   export Event, succeed, fail, @callback, remove_callback
@@ -20,7 +21,6 @@ module SimJulia
   export Process, @process, interrupt
   export Container, Resource, Store, put, get, request, release, cancel
   export nowDatetime
-  export OldProcess, @oldprocess, yield, request
 
   include("base.jl")
   include("events.jl")
@@ -31,5 +31,4 @@ module SimJulia
   include("resources/containers.jl")
   include("resources/stores.jl")
   include("utils/time.jl")
-  include("old/processes.jl")
 end

src/old/processes.jl

@@ -23,9 +23,9 @@ mutable struct Simulation <: Environment
   heap :: DataStructures.PriorityQueue{BaseEvent, EventKey}
   eid :: UInt
   sid :: UInt
-  active_proc :: Nullable{AbstractProcess}
+  active_proc :: Union{AbstractProcess, Nothing}
   function Simulation(initial_time::Number=zero(Float64))
-    new(initial_time, DataStructures.PriorityQueue{BaseEvent, EventKey}(), zero(UInt), zero(UInt), Nullable{AbstractProcess}())
+    new(initial_time, DataStructures.PriorityQueue{BaseEvent, EventKey}(), zero(UInt), zero(UInt), nothing)
   end
 end
 
@@ -49,13 +49,13 @@ function now(ev::AbstractEvent)
 end
 
 function active_process(sim::Simulation) :: AbstractProcess
-  get(sim.active_proc)
+  sim.active_proc
 end
 
 function reset_active_process(sim::Simulation)
-  sim.active_proc = Nullable{AbstractProcess}()
+  sim.active_proc = nothing
 end
 
 function set_active_process(sim::Simulation, proc::AbstractProcess)
-  sim.active_proc = Nullable(proc)
+  sim.active_proc = proc
 end

src/simulations.jl

@@ -1,17 +1,17 @@
 function Simulation(initial_time::DateTime)
-  Simulation(Base.Dates.datetime2epochms(initial_time))
+  Simulation(Dates.datetime2epochms(initial_time))
 end
 
 function run(env::Environment, until::DateTime)
-  run(env, Base.Dates.datetime2epochms(until))
+  run(env, Dates.datetime2epochms(until))
 end
 
 function timeout(env::Environment, delay::Period; priority::Int8=zero(Int8), value::Any=nothing)
   time = now(env)
-  del = Base.Dates.datetime2epochms(Base.Dates.epochms2datetime(time)+delay)-time
+  del = Dates.datetime2epochms(Dates.epochms2datetime(time)+delay)-time
   timeout(env, del; priority=priority, value=value)
 end
 
 function nowDatetime(env::Environment)
-  Base.Dates.epochms2datetime(now(env))
+  Dates.epochms2datetime(now(env))
 end