conway_deathmatch 0.4.0.3 → 0.4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c55f0ff917347b974ee425de2f25661dc4ee0364
-  data.tar.gz: 326a6784a63cc061b677798fcb92d8ddc0c9b500
+  metadata.gz: 4c99458e1f16832079d5dec01f15b43b05d0062e
+  data.tar.gz: d99447fcdf8a6ef51f8078e5c9783dabd44a5649
 SHA512:
-  metadata.gz: 6c894e1ac6f4cb133e70273b005d950569935f7f95e2078ea5ac1236f9133ce937c4d45911bedaf083de830c8d93b8a5e322fce3a8da59f027c9ce58d935fce7
-  data.tar.gz: 5fdecf2a42232cc7e4d2dae02fa4692a4a8783a31824766643b0dc4e1f860bcc04f703555eff33fc6e2ab4e337dfda56797e859e675a347ecaf939a1c79e37bd
+  metadata.gz: 8528c9fcb640e4291b7d1adeb50c68fe0e555af1000f201322f0c0174ef5de4f7cb36bc49d8ffb680214d35b25e84b1b451ed56c3c22ee39e74df02528ba3fef
+  data.tar.gz: 8da6e47b4acd9b7fa42fa391875e642661437aceaa3d841e3fad91456de294f235abe2aeafa85145b6536d4cf2bb1ef47a5a8cfa7a572c1add1f68a92763d6e7

data/VERSION

@@ -1 +1 @@
-0.4.0.3
+0.4.1.1

data/conway_deathmatch.gemspec

@@ -24,11 +24,11 @@ Gem::Specification.new do |s|
     'test/test_shapes.rb',
   ]
   s.executables = ['conway_deathmatch']
+  s.add_runtime_dependency "slop", "~> 3.0"
   s.add_development_dependency "buildar", "~> 2"
   s.add_development_dependency "minitest", "~> 5"
   s.add_development_dependency "ruby-prof", "~> 0"
   # uncomment and set ENV['CODE_COVERAGE']
   # s.add_development_dependency "simplecov", "~> 0.9.0"
-  s.add_runtime_dependency "slop", "~> 3.0"
   s.required_ruby_version = "~> 2"
 end

data/lib/conway_deathmatch/board_state.rb

@@ -1,3 +1,4 @@
+#require 'lager'
 module ConwayDeathmatch; end         # create namespace
 
 # data structure for the board - 2d array
@@ -5,6 +6,8 @@ module ConwayDeathmatch; end         # create namespace
 # static boundaries are treated as dead
 #
 class ConwayDeathmatch::BoardState
+#  extend Lager
+#  log_to $stderr
   class BoundsError < RuntimeError; end
 
   DEAD = '.'
@@ -24,20 +27,30 @@ class ConwayDeathmatch::BoardState
     @y_len = y_len
     @state = self.class.new_state(x_len, y_len)
     @deathmatch = deathmatch
+#    @lager = self.class.lager
   end
 
   # Conway's Game of Life transition rules
   def next_value(x, y)
+    # don't bother toroidaling, only called by #tick
     n, birthright = neighbor_stats(x, y)
-    if alive?(x, y)
+    if @state[x][y] != DEAD
       (n == 2 or n == 3) ? birthright : DEAD
     else
       (n == 3) ? birthright : DEAD
     end
   end
 
+  def value(x, y)
+    x = x % @x_len
+    y = y % @y_len
+    @state[x][y]
+  end
+
   # total (alive) neighbor count and birthright
   def neighbor_stats(x, y)
+    x = x % @x_len
+    y = y % @y_len
     npop = neighbor_population(x, y).tap { |h| h.delete(DEAD) }
 
     case @deathmatch
@@ -83,29 +96,15 @@ class ConwayDeathmatch::BoardState
     end
   end
 
-  def value(x, y)
-    in_bounds!(x,y)
-    @state[x][y].dup
-  end
-
-  def in_bounds?(x, y)
-    x.between?(0, @x_len - 1) and y.between?(0, @y_len - 1)
-  end
-
-  def in_bounds!(x, y)
-    raise(BoundsError, "(#{x}, #{y})") unless in_bounds?(x, y)
-  end
-
-  # out of bounds considered dead
-  def alive?(x, y)
-    @state[x][y] != DEAD rescue false
-  end
-
   # population of every neighboring entity, including DEAD
   def neighbor_population(x, y)
+    x = x % @x_len
+    y = y % @y_len
     neighbors = Hash.new(0)
-    (x-1 > 0 ? x-1 : 0).upto(x+1 < @x_len ? x+1 : @x_len - 1) { |xn|
-      (y-1 > 0 ? y-1 : 0).upto(y+1 < @y_len ? y+1 : @y_len - 1) { |yn|
+    (x-1).upto(x+1) { |xn|
+      (y-1).upto(y+1) { |yn|
+        xn = xn % @x_len
+        yn = yn % @y_len
         neighbors[@state[xn][yn]] += 1 unless (xn == x and yn == y)
       }
     }
@@ -122,18 +121,19 @@ class ConwayDeathmatch::BoardState
     self
   end
 
-  # set a single point, raise on OOB
+  # set a single point
   def populate(x, y, val = ALIVE)
-    in_bounds!(x, y)
+    x = x % @x_len
+    y = y % @y_len
     @state[x][y] = val
   end
 
-  # set several points (2d array), ignore OOB
+  # set several points (2d array)
   def add_points(points, x_off = 0, y_off = 0, val = ALIVE)
     points.each { |point|
-      x = point[0] + x_off
-      y = point[1] + y_off
-      @state[x][y] = val if self.in_bounds?(x, y)
+      x = (point[0] + x_off) % @x_len
+      y = (point[1] + y_off) % @y_len
+      @state[x][y] = val
     }
     self
   end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: conway_deathmatch
 version: !ruby/object:Gem::Version
-  version: 0.4.0.3
+  version: 0.4.1.1
 platform: ruby
 authors:
 - Rick Hull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2014-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: buildar
+  name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
+        version: '3.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: buildar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: ruby-prof
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 - !ruby/object:Gem::Dependency
-  name: slop
+  name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: Deathmatch
 email: 
 executables:
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Conway's Game of Life