Modify constructors for Store and Container

Author: BenLauwens

benchmark/coroutines_MM1.jl

@@ -17,7 +17,7 @@ end
 
 function test_mm1(n::Float64)
   sim = Simulation()
-  server = Resource(sim, 1)
+  server = Resource(sim)
   @coroutine exp_source(sim, 1.0, server, 1.1)
   run(sim, n)
 end

benchmark/processes_MM1.jl

@@ -25,7 +25,7 @@ end
 
 function test_mm1(n::Float64)
   sim = Simulation()
-  server = Resource(sim, 1)
+  server = Resource(sim)
   @process exp_source(sim, 1.0, server, 1.1)
   run(sim, n)
 end

examples/Ross_Simulation_7.7_A_repair_problem.ipynb

@@ -29,9 +29,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "Pkg.update()\n",
@@ -48,7 +46,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 1,
    "metadata": {
     "collapsed": true
    },
@@ -68,10 +66,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
-   "metadata": {
-    "collapsed": false
-   },
+   "execution_count": 2,
+   "metadata": {},
    "outputs": [],
    "source": [
     "const RUNS = 5\n",
@@ -95,18 +91,16 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
-   "metadata": {
-    "collapsed": false
-   },
+   "execution_count": 3,
+   "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
        "machine (generic function with 1 method)"
       ]
      },
-     "execution_count": 15,
+     "execution_count": 3,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -147,18 +141,16 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 16,
-   "metadata": {
-    "collapsed": false
-   },
+   "execution_count": 4,
+   "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
        "start_sim (generic function with 1 method)"
       ]
      },
-     "execution_count": 16,
+     "execution_count": 4,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -188,18 +180,16 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
-   "metadata": {
-    "collapsed": false
-   },
+   "execution_count": 5,
+   "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
        "sim_repair (generic function with 1 method)"
       ]
      },
-     "execution_count": 17,
+     "execution_count": 5,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -208,7 +198,7 @@
     "function sim_repair()\n",
     "    sim = Simulation()\n",
     "    repair_facility = Resource(sim)\n",
-    "    spares = Store(Coroutine, sim)\n",
+    "    spares = Store{Coroutine}(sim)\n",
     "    @coroutine start_sim(sim, repair_facility, spares)\n",
     "    msg = run(sim)\n",
     "    stop_time = now(sim)\n",
@@ -226,10 +216,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 18,
-   "metadata": {
-    "collapsed": false
-   },
+   "execution_count": 6,
+   "metadata": {},
    "outputs": [
     {
      "name": "stdout",

src/resources/containers.jl

@@ -11,21 +11,17 @@ mutable struct Container{N<:Number} <: AbstractResource
   seid :: UInt
   put_queue :: DataStructures.PriorityQueue{Put, ContainerKey{N}}
   get_queue :: DataStructures.PriorityQueue{Get, ContainerKey{N}}
-  function Container{N}(env::Environment, capacity::N, level::N) where {N<:Number}
+  function Container{N}(env::Environment, capacity::N=one(N); level::N=zero(N)) where {N<:Number}
     new(env, capacity, level, zero(UInt), DataStructures.PriorityQueue{Put, ContainerKey{N}}(), DataStructures.PriorityQueue{Get, ContainerKey{N}}())
   end
 end
 
-function Container(env::Environment, capacity::N; level::N=zero(N)) where N<:Number
-  Container{N}(env, capacity, level)
+function Container(env::Environment, capacity::N=one(N); level::N=zero(N)) where N<:Number
+  Container{N}(env, capacity, level=level)
 end
 
 const Resource = Container{Int}
 
-function Resource(env::Environment, capacity::Int=1; level::Int=0) :: Resource
-  Resource(env, capacity, level)
-end
-
 function Put(con::Container{N}, amount::N; priority::Int=0) where N<:Number
   put_ev = Put(con.env)
   con.put_queue[put_ev] = ContainerKey(priority, con.seid+=one(UInt), amount)

src/resources/stores.jl

@@ -18,15 +18,11 @@ mutable struct Store{T} <: AbstractResource
   seid :: UInt
   put_queue :: DataStructures.PriorityQueue{Put, StorePutKey{T}}
   get_queue :: DataStructures.PriorityQueue{Get, StoreGetKey}
-  function Store{T}(env::Environment, capacity::UInt) where {T}
+  function Store{T}(env::Environment; capacity::UInt=typemax(UInt)) where {T}
     new(env, capacity, Set{T}(), zero(UInt), DataStructures.PriorityQueue{Put, StorePutKey{T}}(), DataStructures.PriorityQueue{Get, StoreGetKey}())
   end
 end
 
-function Store(t::Type, env::Environment, capacity::UInt=typemax(UInt))
-  Store{t}(env, capacity)
-end
-
 function Put(sto::Store{T}, item::T; priority::Int=0) where T
   put_ev = Put(sto.env)
   sto.put_queue[put_ev] = StorePutKey{T}(priority, sto.seid+=one(UInt), item)

test/containers.jl

@@ -79,6 +79,6 @@ function customer(sim::Simulation, server::Resource, i::Int)
 end
 
 sim = Simulation()
-server = Resource(sim, 1)
+server = Resource(sim)
 @process source(sim, server)
 run(sim, 10.0)

test/stores.jl

@@ -24,7 +24,7 @@ end
 end
 
 sim = Simulation()
-sto = Store(StoreObject, sim)
+sto = Store{StoreObject}(sim)
 @coroutine my_consumer(sim, sto)
 @coroutine my_producer(sim, sto)
 run(sim)