Merge branch 'dev'

Author: pbayer

Project.toml

@@ -1,7 +1,7 @@
 name = "DiscreteEvents"
 uuid = "127e53a7-d08a-4bd9-afb0-daf0d2b65a85"
 authors = ["Paul Bayer <Paul.Bayer@gleichsam.de>"]
-version = "0.3.3"
+version = "0.3.4"
 
 [deps]
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"

src/DiscreteEvents.jl

@@ -27,7 +27,7 @@ pkg> add("https://github.com/pbayer/DiscreteEvents.jl")
 module DiscreteEvents
 
 "Gives the package version."
-const version = v"0.3.3"
+const version = v"0.3.4"
 
 using Unitful, Random, DataStructures, Logging, .Threads, Distributions
 import Unitful: FreeUnits, Time

src/schedule.jl

@@ -209,7 +209,7 @@ periodic!(rtc::RTClock, ex::T) where T<:Action = _assign(rtc, Sample(ex))
 # Return a random number out of the thread ids of all available parallel clocks
 function _spawnid(c::Clock) 
     if c.id == 1
-        return ifelse(isempty(c.ac), 1, rand(rng, 1:(length(c.ac)+1)))
+        return isempty(c.ac) ? 1 : rand(rng, 1:(length(c.ac)+1))
     elseif isempty(c.ac)
         return c.id
     else
@@ -221,21 +221,21 @@ _spawnid(ac::ActiveClock) = _spawnid(ac.master[])
 # return a valid clock id 
 function _cid(c::Clock, cid::Int, spawn::Bool)
     if c.id == cid
-        return ifelse(spawn, _spawnid(c), cid)
+        return spawn ? _spawnid(c) : cid
     elseif c.id == 1
         isempty(c.ac) && return 1
         cid ∈ (eachindex(c.ac).+1) && return cid
-        return ifelse(spawn, _spawnid(c), 1) 
+        return spawn ? _spawnid(c) : 1 
     else
         _cid(c.ac[], cid, spawn)
     end
 end
 function _cid(ac::ActiveClock, cid::Int, spawn::Bool) 
     if ac.id == cid
-        return ifelse(spawn, _spawnid(ac.master[]), cid)
+        return spawn ? _spawnid(ac.master[]) : cid
     else
         cid ∈ 1:(length(ac.master[].ac).+1) && return cid
-        return ifelse(spawn, _spawnid(ac.master[]), ac.id)
+        return spawn ? _spawnid(ac.master[]) : ac.id
     end
 end
 _cid(rtc::RTClock, cid::Int, spawn::Bool) = rtc.id

test/test_threads.jl

@@ -13,7 +13,7 @@ clk = Clock()
 if VERSION ≥ v"1.3"
     if nthreads() > 1
         include("test_threads1.jl")
-        # include("test_threads2.jl")
+        include("test_threads2.jl")
     else
         @test_warn "no parallel threads available!" fork!(clk)
     end