conway_deathmatch 0.3.0.1 → 0.3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ea3aea969a6ce5615eaef2ec94e28a208af8320
-  data.tar.gz: fa83c5b84e0c62ae98ddad57f0ab0dbd684f69bf
+  metadata.gz: 74cb09c10b150b79fde2d90b7ec9f19ba734ea45
+  data.tar.gz: afab5401c02eacf4f0fdbcba7635248d030e77ac
 SHA512:
-  metadata.gz: f910a7e0b36c79ad1265fa382f9d9d2c9ce786577c25f9bd8ce9265fb8a610aaf9aae7dcadb565b0ed8b7cc530f4e6addcdc4ae26b1547b01cf6e272843d46e4
-  data.tar.gz: e507e5af3bff546ba8652c2c009e41067a6a72d269eac10b3c442f087dc010e0c3e606ce80bc898f8521fa28541746f5e7d4b116393f44340fcc53dc33d6a805
+  metadata.gz: 9bd27fa170687568717234356174f09cf3fc57fbb20e2516c46cdad921a81b6db4c78983a976b553afc3f496ca05091d4ccd0264187542a7b70b621ccce4d24f
+  data.tar.gz: dafed28ce3008911055047b5ca22aaeb3b049b5735965542f6ee156d4a22c78c03ae194546dcc48f0efcded14af0066bdafe0ded84e88de33e1e861d1bae2ff8

data/lib/conway_deathmatch/board_state.rb

@@ -19,9 +19,8 @@ class ConwayDeathmatch::BoardState
   attr_accessor :multiplayer
   
   def initialize(x_len, y_len)
-    # ranges, yay! (exclude_end)
-    @xr = (0...x_len)
-    @yr = (0...y_len)
+    @x_len = x_len
+    @y_len = y_len
     @state = self.class.new_state(x_len, y_len)
     @multiplayer = false
   end
@@ -42,26 +41,28 @@ class ConwayDeathmatch::BoardState
   end
 
   def in_bounds?(x, y)
-    @xr.include?(x) and @yr.include?(y)
+    x.between?(0, @x_len - 1) and y.between?(0, @y_len - 1)
   end
   
   def in_bounds!(x, y)
-    raise(BoundsError, "(#{x}, #{y}) (#{@xr}, #{@yr})") unless in_bounds?(x, y)
+    raise(BoundsError, "(#{x}, #{y})") unless in_bounds?(x, y)
   end
   
   # out of bounds considered dead
   def alive?(x, y)
-    in_bounds?(x, y) and @state[x][y] != DEAD
+    @state[x][y] != DEAD rescue false
   end
   
   # population of each neighbor
   def neighbor_population(x, y)
+    outer_ring = x == 0 or y == 0 or x == @x_len - 1 or y == @y_len - 1
     neighbors = Hash.new(0)
     (x-1..x+1).each { |xn|
+      next if outer_ring and xn < 0 or xn >= @x_len
       (y-1..y+1).each { |yn|
-        if alive?(xn, yn) and !(xn == x and yn == y) # don't count self
-          neighbors[@state[xn][yn]] += 1
-        end
+        next if outer_ring and yn < 0 or yn >= @y_len
+        next if xn == x and yn == y # don't count self
+        neighbors[@state[xn][yn]] += 1
       }
     }
     neighbors
@@ -82,14 +83,21 @@ class ConwayDeathmatch::BoardState
       }
       [total, birthright]
     else
-      [neighbor_population(x, y).values.reduce(:+), ALIVE]
+      count = 0
+      neighbor_population(x, y).each { |sym, cnt|
+        next if sym == DEAD
+        count += cnt
+      }
+      [count, ALIVE]
     end
   end
   
   # generate the next state table
   def tick
-    new_state = self.class.new_state(@xr.last, @yr.last)
-    @xr.each { |x| @yr.each { |y|  new_state[x][y] = next_value(x, y)  } }
+    new_state = self.class.new_state(@x_len, @y_len)
+    @x_len.times { |x|
+      @y_len.times { |y| new_state[x][y] = next_value(x, y) }
+    }
     @state = new_state
     self
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conway_deathmatch
 version: !ruby/object:Gem::Version
-  version: 0.3.0.1
+  version: 0.3.1.1
 platform: ruby
 authors:
 - Rick Hull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-30 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: buildar