discrete_event 1.1.0 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9e7875c381a853a1246453ae83b5cfb1f1b50f05
+  data.tar.gz: 1e405666d2a7e03b0123f2ace8e4e1ca571242c1
+SHA512:
+  metadata.gz: 318572c57f5188a0e4450aa37ecc7516d2152a4d65865b238ba97cf7ed0c797803aa54e78d0aa3f2d8681281601071f97ac37c3210acb14ff9f08211dbc35531
+  data.tar.gz: d0f301f5b7de3140efb41f812e269b750c466331ba583868c5c50e1b98b768c9e6b03add22fdc5c80a1323bca8c68a38889a6e8586aed58d83a56cb49d31ac21

data/README.rdoc

@@ -31,16 +31,17 @@ subclass of {DiscreteEvent::EventQueue}, to simulate an M/M/1 queueing system.
 
     attr_reader :arrival_rate, :service_rate, :system, :served
 
-    def initialize arrival_rate, service_rate
+    def initialize(arrival_rate, service_rate)
       super()
-      @arrival_rate, @service_rate = arrival_rate, service_rate
+      @arrival_rate = arrival_rate
+      @service_rate = service_rate
       @system = []
       @served = []
     end
 
     # Sample from Exponential distribution with given mean rate.
-    def rand_exp rate
-      -Math::log(rand)/rate
+    def rand_exp(rate)
+      -Math.log(rand) / rate
     end
 
     # Customer arrival process.
@@ -69,7 +70,11 @@ subclass of {DiscreteEvent::EventQueue}, to simulate an M/M/1 queueing system.
     # Number of customers currently waiting for service (does not include
     # the one (if any) currently being served).
     def queue_length
-      if system.empty? then 0 else system.length - 1 end
+      if system.empty?
+        0
+      else
+        system.length - 1
+      end
     end
 
     # Called by super.run.
@@ -81,7 +86,7 @@ subclass of {DiscreteEvent::EventQueue}, to simulate an M/M/1 queueing system.
   #
   # Run until a fixed number of passengers has been served.
   #
-  def mm1_queue_demo arrival_rate, service_rate, num_pax
+  def mm1_queue_demo(arrival_rate, service_rate, num_pax)
     # Run simulation and accumulate stats.
     q = MM1Queue.new arrival_rate, service_rate
     num_served = 0
@@ -89,7 +94,7 @@ subclass of {DiscreteEvent::EventQueue}, to simulate an M/M/1 queueing system.
     total_wait = 0.0
     q.run do
       unless q.served.empty?
-        raise "confused" if q.served.size > 1
+        raise 'confused' if q.served.size > 1
         c = q.served.shift
         total_queue += c.queue_on_arrival
         total_wait  += c.service_begin - c.arrival_time
@@ -103,12 +108,13 @@ subclass of {DiscreteEvent::EventQueue}, to simulate an M/M/1 queueing system.
     expected_mean_wait = rho / (service_rate - arrival_rate)
     expected_mean_queue = arrival_rate * expected_mean_wait
 
-    return total_queue / num_served, expected_mean_queue,
-           total_wait  / num_served, expected_mean_wait
+    [
+      total_queue / num_served, expected_mean_queue,
+      total_wait  / num_served, expected_mean_wait
+    ]
   end
 
 
-
 This and other examples are available in the <tt>test/discrete_event</tt>
 directory.
 
@@ -150,14 +156,14 @@ You may also be interested in the Ruby bindings of the GNU Science Library, whic
 * added DiscreteEvent::Simulation#at_each_index (removed in 1.0.0)
 * added DiscreteEvent::Simulation#recur_after
 * added DiscreteEvent::Simulation#every
-* {DiscreteEvent::FakeRand} now supports the <tt>Kernel::rand(n)</tt> form. 
+* {DiscreteEvent::FakeRand} now supports the <tt>Kernel::rand(n)</tt> form.
 
 <em>0.1.0:</em>
 * first release
 
 == LICENSE
 
-Copyright (c) 2010-2011 John Lees-Miller
+Copyright (c) 2010-2017 John Lees-Miller
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -177,4 +183,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

data/lib/discrete_event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pqueue'
 
 require 'discrete_event/event_queue'
@@ -14,7 +16,7 @@ module DiscreteEvent
   #
   # @return [Simulation]
   #
-  def self.simulation *args, &block 
+  def self.simulation(*args, &block)
     sim = DiscreteEvent::Simulation.new(*args)
     sim.instance_eval(&block)
     sim

data/lib/discrete_event/event_queue.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiscreteEvent
   #
   # Queue of pending events; also keeps track of the clock (the current time).
@@ -32,9 +34,9 @@ module DiscreteEvent
     #
     attr_reader :events
 
-    def initialize now=0.0
+    def initialize(now = 0.0)
       @now = now
-      @events = PQueue.new {|a,b| a.time < b.time}
+      @events = PQueue.new { |a, b| a.time < b.time }
       @recur_interval = nil
     end
 
@@ -48,8 +50,8 @@ module DiscreteEvent
     #
     # @return [Event]
     #
-    def at time, &action
-      raise "cannot schedule event in the past" if time < now
+    def at(time, &action)
+      raise 'cannot schedule event in the past' if time < now
       event = Event.new(time, action)
       @events.push(event)
       event
@@ -65,7 +67,7 @@ module DiscreteEvent
     #
     # @return [Event]
     #
-    def after delay, &action
+    def after(delay, &action)
       at(@now + delay, &action)
     end
 
@@ -76,7 +78,7 @@ module DiscreteEvent
     #
     # @return [nil]
     #
-    def cancel event
+    def cancel(event)
       # not very efficient but hopefully not used very often
       temp = []
       until @events.empty? || @events.top.time > event.time
@@ -84,8 +86,8 @@ module DiscreteEvent
         break if e.equal?(event)
         temp << e
       end
-      temp.each do |e|
-        @events.push(e)
+      temp.each do |temp_event|
+        @events.push(temp_event)
       end
       nil
     end
@@ -93,7 +95,7 @@ module DiscreteEvent
     #
     # Schedule +action+ (a block) to run for each element in the given list
     # (possibly at different times).
-    # 
+    #
     # This method may be of interest if you have a large number of events that
     # occur at known times. You could use {#at} to add each one to the event
     # queue at the start of the simulation, but this will make adding other
@@ -125,7 +127,7 @@ module DiscreteEvent
     #
     # @return [nil]
     #
-    def at_each elements, time=nil, &action
+    def at_each(elements, time = nil, &action)
       raise ArgumentError, 'no action given' unless block_given?
 
       unless elements.empty?
@@ -133,11 +135,11 @@ module DiscreteEvent
         if time.nil?
           element_time = element.time
         elsif time.is_a? Proc
-          element_time = time.call(element) 
+          element_time = time.call(element)
         elsif time.is_a? Symbol
           element_time = element.send(time)
-        else 
-          raise ArgumentError, "bad time"
+        else
+          raise ArgumentError, 'bad time'
         end
 
         at element_time do
@@ -178,13 +180,13 @@ module DiscreteEvent
     #
     # @return [nil]
     #
-    def recur_after interval
-      raise "cannot recur twice" if @recur_interval
+    def recur_after(interval)
+      raise 'cannot recur twice' if @recur_interval
       @recur_interval = interval
       nil
     end
 
-    # 
+    #
     # Schedule +action+ (a block) to run periodically.
     #
     # This is useful for statistics collection.
@@ -206,7 +208,7 @@ module DiscreteEvent
     #
     # @return [nil]
     #
-    def every interval, start=0, &action
+    def every(interval, start = 0)
       at start do
         yield
         recur_after interval
@@ -221,15 +223,11 @@ module DiscreteEvent
     # (that is, the current event hasn't finished yet, so it's still in some
     # sense the next event).
     #
-    # @return [Numeric, nil] 
+    # @return [Numeric, nil]
     #
     def next_event_time
       event = @events.top
-      if event
-        event.time
-      else
-        nil
-      end
+      event.time if event
     end
 
     #
@@ -266,7 +264,7 @@ module DiscreteEvent
     #
     # @return [nil]
     #
-    def run_to time
+    def run_to(time)
       # add an event to ensure that we actually stop at the given time, even if
       # there isn't an event in the queue
       at time do
@@ -304,16 +302,15 @@ module DiscreteEvent
       self
     end
 
-    # 
+    #
     # Clear any pending events in the event queue and reset {#now}.
     #
     # @return [self]
     #
-    def reset now=0.0
+    def reset(now = 0.0)
       @now = now
       @events.clear
       self
     end
   end
 end
-

data/lib/discrete_event/events.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiscreteEvent
   #
   # Mix-in for simulations with multiple objects that have to share the same
@@ -16,7 +18,7 @@ module DiscreteEvent
     #
     # @return [Event]
     #
-    def at time, &action
+    def at(time, &action)
       event_queue.at(time, &action)
     end
 
@@ -29,7 +31,7 @@ module DiscreteEvent
     #
     # @return [Event]
     #
-    def after delay, &action
+    def after(delay, &action)
       event_queue.after(delay, &action)
     end
 
@@ -38,7 +40,7 @@ module DiscreteEvent
     #
     # @return [nil]
     #
-    def cancel event
+    def cancel(event)
       event_queue.cancel(event)
     end
 
@@ -63,7 +65,7 @@ module DiscreteEvent
     #
     # @return [nil]
     #
-    def at_each elements, time=nil, &action
+    def at_each(elements, time = nil, &action)
       event_queue.at_each(elements, time, &action)
     end
 
@@ -74,11 +76,11 @@ module DiscreteEvent
     #
     # @return [nil]
     #
-    def recur_after interval
+    def recur_after(interval)
       event_queue.recur_after(interval)
     end
 
-    # 
+    #
     # See {EventQueue#every}.
     #
     # @param [Numeric] interval non-negative
@@ -86,7 +88,7 @@ module DiscreteEvent
     # @param [Numeric] start block first runs at this time
     #
     # @return [nil]
-    def every interval, start=0, &action
+    def every(interval, start = 0, &action)
       event_queue.every(interval, start, &action)
     end
 
@@ -100,4 +102,3 @@ module DiscreteEvent
     end
   end
 end
-

data/lib/discrete_event/fake_rand.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiscreteEvent
   #
   # A utility for testing objects that use the built-in Ruby pseudorandom
@@ -36,16 +38,16 @@ module DiscreteEvent
     # @param [Array] fakes sequence of numbers to return
     # @return [nil]
     #
-    def self.for object, *fakes
+    def self.for(object, *fakes)
       undo_for(object) # in case rand is already faked
       (class << object; self; end).instance_eval do
         define_method :rand do |*args|
-          raise "out of fake_rand numbers" if fakes.empty?
+          raise 'out of fake_rand numbers' if fakes.empty?
           r = fakes.shift
 
           # can be either the rand() or rand(n) form
           n = args.shift || 0
-          if n == 0
+          if n.zero?
             r
           else
             (r * n).to_i
@@ -62,11 +64,10 @@ module DiscreteEvent
     # @param [Object] object to modify
     # @return [nil]
     #
-    def self.undo_for object
-      if object.methods.map(&:to_s).member?('rand')
-        (class << object; self; end).instance_eval do
-          remove_method :rand
-        end
+    def self.undo_for(object)
+      return unless object.methods.map(&:to_s).member?('rand')
+      (class << object; self; end).instance_eval do
+        remove_method :rand
       end
     end
   end

data/lib/discrete_event/simulation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiscreteEvent
   #
   # A simulation, including an {EventQueue}, the current time, and various
@@ -12,17 +14,16 @@ module DiscreteEvent
     #
     # @abstract
     #
-    def start
-    end
+    def start; end
 
     #
-    # Run (or continue, if there are existing events) the simulation until 
+    # Run (or continue, if there are existing events) the simulation until
     # +:stop+ is thrown, or there are no more events.
     #
-    # @yield [] after each event runs 
+    # @yield [] after each event runs
     # @return [nil]
     #
-    def run &block
+    def run
       start if @events.empty?
       catch :stop do
         if block_given?
@@ -34,4 +35,3 @@ module DiscreteEvent
     end
   end
 end
-

data/lib/discrete_event/version.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module DiscreteEvent
-  VERSION_MAJOR = 1
-  VERSION_MINOR = 1
+  VERSION_MAJOR = 2
+  VERSION_MINOR = 0
   VERSION_PATCH = 0
   VERSION = [VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH].join('.')
 end

data/test/discrete_event/discrete_event_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'discrete_event/test_helper'
 
 require 'discrete_event/ex_consumer.rb'
@@ -6,10 +8,12 @@ require 'discrete_event/ex_mm1_queue.rb'
 include DiscreteEvent
 include DiscreteEvent::Example
 
-class TestDiscreteEvent < Test::Unit::TestCase
-  def assert_near expected, observed, tol=1e-6
-    assert((expected - observed).abs < tol,
-      "expected |#{expected} - #{observed}| < #{tol}")
+class TestDiscreteEvent < MiniTest::Test
+  def assert_near(expected, observed, tol = 1e-6)
+    assert(
+      (expected - observed).abs < tol,
+      "expected |#{expected} - #{observed}| < #{tol}"
+    )
   end
 
   def test_fake_rand
@@ -25,7 +29,7 @@ class TestDiscreteEvent < Test::Unit::TestCase
     assert_equal [0.125, 0.375, 0.875], c.consumed
 
     # Now have run out of fakes.
-    assert_raise(RuntimeError){ c.reset.run }
+    assert_raises(RuntimeError) { c.reset.run }
 
     # See what happens if we fake twice.
     FakeRand.for(c, 0.5, 0.25, 0.125)
@@ -33,7 +37,7 @@ class TestDiscreteEvent < Test::Unit::TestCase
     assert_equal [0.5, 0.75, 0.875], c.consumed
 
     # Now have run out of fakes, again.
-    assert_raise(RuntimeError){ c.reset.run }
+    assert_raises(RuntimeError) { c.reset.run }
 
     # Can undo and get original behavior back.
     FakeRand.undo_for(c)
@@ -57,13 +61,13 @@ class TestDiscreteEvent < Test::Unit::TestCase
     assert_equal 10, o.test
 
     # Now have run out of fakes.
-    assert_raise(RuntimeError){ o.test }
+    assert_raises(RuntimeError) { o.test }
   end
-  
+
   def test_mm1_queue_not_busy
     # Service begins immediately when queue is not busy.
     q = MM1Queue.new 0.5, 1.0
-    fakes = [1, 1, 1, 1, 1].map {|x| 1/Math::E**x}
+    fakes = [1, 1, 1, 1, 1].map { |x| 1 / Math::E**x }
     FakeRand.for(q, *fakes)
     q.run do
       throw :stop if q.served.size >= 2
@@ -75,15 +79,17 @@ class TestDiscreteEvent < Test::Unit::TestCase
     assert_near 4.0, q.served[1].service_begin
     assert_near 5.0, q.served[1].service_end
   end
-  
+
   def test_mm1_queue_busy
     # Service begins after previous customer when queue is busy.
     q = MM1Queue.new 0.5, 1.0
-    fakes = [0.1, 0.1, # arrival, service for first customer
+    fakes = [
+      0.1, 0.1,        # arrival, service for first customer
       0.01, 0.01,      # arrival times for second two customers
       1,               # arrival for forth customer
       0.1, 0.1,        # service times for second two customers
-      1].map {|x| 1/Math::E**x}
+      1
+    ].map { |x| 1 / Math::E**x }
     FakeRand.for(q, *fakes)
     q.run do
       throw :stop if q.served.size >= 3
@@ -101,14 +107,14 @@ class TestDiscreteEvent < Test::Unit::TestCase
 
   def test_recur_after
     output = []
-    DiscreteEvent.simulation {
+    DiscreteEvent.simulation do
       at 0 do
         output << now
         recur_after 5 if now < 20
       end
 
       run
-    }
+    end
     assert_equal [0, 5, 10, 15, 20], output
   end
 
@@ -117,7 +123,7 @@ class TestDiscreteEvent < Test::Unit::TestCase
     # displace the root element, even if you call after(0), which is just an
     # edge case anyway.
     output = []
-    DiscreteEvent.simulation {
+    DiscreteEvent.simulation do
       at 0 do
         output << now
         after 0 do
@@ -130,64 +136,64 @@ class TestDiscreteEvent < Test::Unit::TestCase
       end
 
       run
-    }
+    end
     assert_equal [0, 42, 13, 5, 42, 13, 10, 42, 13], output
   end
 
   def test_every
     output = []
-    DiscreteEvent.simulation {
+    DiscreteEvent.simulation do
       every 3 do
         output << now
         throw :stop if now > 10
       end
       run
-    }
-    assert_equal [0,3,6,9,12], output
+    end
+    assert_equal [0, 3, 6, 9, 12], output
   end
 
   Alert = Struct.new(:when, :message)
 
   def test_at_each_with_symbol
     output = []
-    DiscreteEvent.simulation {
-      alerts = [Alert.new(12, "ha!"), Alert.new(42, "ah!")] # and many more
+    DiscreteEvent.simulation do
+      alerts = [Alert.new(12, 'ha!'), Alert.new(42, 'ah!')] # and many more
       at_each alerts, :when do |alert|
         output << now << alert.message
       end
       run
-    }
+    end
     assert_equal [12, 'ha!', 42, 'ah!'], output
   end
 
   def test_at_each_with_proc
     output = []
-    DiscreteEvent.simulation {
-      alerts = [Alert.new(12, "ha!"), Alert.new(42, "ah!")] # and many more
-      at_each(alerts, proc{|alert| alert.when}) do |alert|
+    DiscreteEvent.simulation do
+      alerts = [Alert.new(12, 'ha!'), Alert.new(42, 'ah!')] # and many more
+      at_each(alerts, proc { |alert| alert.when }) do |alert|
         output << now << alert.message
       end
       run
-    }
+    end
     assert_equal [12, 'ha!', 42, 'ah!'], output
   end
 
   Alert2 = Struct.new(:time, :message)
   def test_at_each_with_default
     output = []
-    DiscreteEvent.simulation {
-      alerts = [Alert2.new(12, "ha!"), Alert2.new(42, "ah!")] # and many more
+    DiscreteEvent.simulation do
+      alerts = [Alert2.new(12, 'ha!'), Alert2.new(42, 'ah!')] # and many more
       at_each alerts do |alert|
         output << now << alert.message
       end
       run
-    }
+    end
     assert_equal [12, 'ha!', 42, 'ah!'], output
   end
 
   def test_next_event_time
-    output= []
-    s = DiscreteEvent.simulation {
+    output = []
+    s = DiscreteEvent.simulation do
       at 0 do
         output << next_event_time
       end
@@ -195,7 +201,7 @@ class TestDiscreteEvent < Test::Unit::TestCase
       at 5 do
         output << next_event_time
       end
-    }
+    end
     assert_equal 0, s.next_event_time
     assert s.run_next
     assert_equal 5, s.next_event_time
@@ -215,16 +221,16 @@ class TestDiscreteEvent < Test::Unit::TestCase
     eq.at 42 do
       output << 'bye'
     end
-    for t in eq.to_enum
+    eq.to_enum.each do |t|
       output_times << t
     end
-    assert_equal %w(hi bye), output
+    assert_equal %w[hi bye], output
     assert_equal [13, 42], output_times
   end
-  
+
   def test_mm1_queue_demo
     # Just run the demo... 1000 isn't enough to get a reliable average.
-    obs_q, exp_q, obs_w, exp_w= mm1_queue_demo(0.25, 0.5, 1000)
+    _obs_q, exp_q, _obs_w, exp_w = mm1_queue_demo(0.25, 0.5, 1000)
     assert_near exp_q, 0.5   # mean queue = rho^2 / (1 - rho)
     assert_near exp_w, 2.0   # mean wait  = rho / (mu - lambda)
   end
@@ -232,7 +238,7 @@ class TestDiscreteEvent < Test::Unit::TestCase
   def test_producer_consumer
     event_queue = EventQueue.new(0)
     consumer = Consumer.new(event_queue)
-    producer = Producer.new(event_queue, %w(a b c d), consumer)
+    producer = Producer.new(event_queue, %w[a b c d], consumer)
 
     FakeRand.for(consumer, 2, 2, 2, 2)
     FakeRand.for(producer, 1, 1, 1, 1)
@@ -243,14 +249,15 @@ class TestDiscreteEvent < Test::Unit::TestCase
       output << [now, consumer.consumed.dup]
     end
     assert_equal [
-      [1, []],                # first object produced
-      [2, []],                # second object produced
-      [3, ["a"]],             # third object produced / first consumed
-      [3, ["a"]],
-      [4, ["a", "b"]],        # fourth object produced / second consumed
-      [4, ["a", "b"]],
-      [5, ["a", "b", "c"]],   # third and fourth objects consumed
-      [6, ["a", "b", "c", "d"]]], output
+      [1, []],          # first object produced
+      [2, []],          # second object produced
+      [3, %w[a]],       # third object produced / first consumed
+      [3, %w[a]],
+      [4, %w[a b]],     # fourth object produced / second consumed
+      [4, %w[a b]],
+      [5, %w[a b c]],   # third and fourth objects consumed
+      [6, %w[a b c d]]
+    ], output
   end
 
   def test_cancel_single
@@ -259,7 +266,7 @@ class TestDiscreteEvent < Test::Unit::TestCase
     #
     out = []
     q = EventQueue.new(0)
-    e_a = q.at( 5) { out << :a }
+    e_a = q.at(5) { out << :a }
     q.cancel e_a
     assert !q.run_next
     assert_equal [], out
@@ -271,7 +278,7 @@ class TestDiscreteEvent < Test::Unit::TestCase
     #
     out = []
     q = EventQueue.new(0)
-    e_a = q.at( 5) { out << :a }
+    e_a = q.at(5) { out << :a }
     assert q.run_next
     assert_equal [:a], out
     q.cancel e_a
@@ -284,8 +291,8 @@ class TestDiscreteEvent < Test::Unit::TestCase
     #
     out = []
     q = EventQueue.new(0)
-    e_a = q.at( 5) { out << :a }
-    e_b = q.at(10) { out << :b }
+    e_a = q.at(5) { out << :a }
+    q.at(10) { out << :b }
     q.cancel e_a
     nil while q.run_next
     assert_equal [:b], out
@@ -295,20 +302,20 @@ class TestDiscreteEvent < Test::Unit::TestCase
     out = []
     q = EventQueue.new(0)
 
-    e_a = q.at( 5) do
+    e_a = q.at(5) do
       out << :a
 
-      e_c = q.at(6) { out << :c }
-      
+      q.at(6) { out << :c }
+
       q.cancel e_a # This should have no effect
     end
 
-    e_b = q.at(10) do
+    q.at(10) do
       out << :b
     end
-    
+
     nil while q.run_next
-    assert_equal [:a, :c, :b], out
+    assert_equal %i[a c b], out
   end
 
   def test_cancel_last
@@ -317,7 +324,7 @@ class TestDiscreteEvent < Test::Unit::TestCase
     #
     out = []
     q = EventQueue.new(0)
-    e_a = q.at( 5) { out << :a }
+    q.at(5) { out << :a }
     e_b = q.at(10) { out << :b }
     q.cancel e_b
     nil while q.run_next
@@ -330,12 +337,12 @@ class TestDiscreteEvent < Test::Unit::TestCase
     #
     out = []
     q = EventQueue.new(0)
-    e_a = q.at( 5) { out << :a }
+    q.at(5) { out << :a }
     e_b = q.at(10) { out << :b }
-    e_c = q.at(13) { out << :c }
+    q.at(13) { out << :c }
     q.cancel e_b
     nil while q.run_next
-    assert_equal [:a, :c], out
+    assert_equal %i[a c], out
   end
 
   def test_cancel_at_same_time_1
@@ -363,7 +370,7 @@ class TestDiscreteEvent < Test::Unit::TestCase
     #
     out = []
     q = EventQueue.new(0)
-    e_a = q.at 10 do
+    q.at 10 do
       out << :a
     end
     e_b = q.at 10 do
@@ -430,4 +437,3 @@ class TestDiscreteEvent < Test::Unit::TestCase
     assert_equal [:a], out
   end
 end
-

metadata

@@ -1,39 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: discrete_event
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - John Lees-Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pqueue
-  requirement: &74031670 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *74031670
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: gemma
-  requirement: &74031240 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
   type: :development
   prerelease: false
-  version_requirements: *74031240
-description: Some simple primitives for event-based discrete event simulation.
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+description: |-
+  Some simple primitives for event-based discrete event
+  simulation.
 email:
 - jdleesmiller@gmail.com
 executables: []
@@ -41,48 +62,40 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- README.rdoc
 - lib/discrete_event.rb
-- lib/discrete_event/events.rb
-- lib/discrete_event/version.rb
 - lib/discrete_event/event_queue.rb
-- lib/discrete_event/simulation.rb
+- lib/discrete_event/events.rb
 - lib/discrete_event/fake_rand.rb
-- README.rdoc
+- lib/discrete_event/simulation.rb
+- lib/discrete_event/version.rb
 - test/discrete_event/discrete_event_test.rb
 homepage: http://github.com/jdleesmiller/discrete_event
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
-- --title
-- discrete_event-1.1.0 Documentation
+- "--title"
+- discrete_event-2.0.0 Documentation
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 326435089
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 326435089
 requirements: []
 rubyforge_project: discrete_event
-rubygems_version: 1.8.17
+rubygems_version: 2.6.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Event-based discrete event simulation.
 test_files:
 - test/discrete_event/discrete_event_test.rb
-has_rdoc: