conway_deathmatch 0.0.0.5 → 0.0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b7a3a53d9ccf0306691cdd351e2ebd7c63b1b5c
-  data.tar.gz: 905eaacf06fc3758726ff2fd623d0a51270012d3
+  metadata.gz: 8ae468567aa50ce8646421adb6a7265142e4db03
+  data.tar.gz: 2e1957b0a8026de25c82b5a1d43644b082c27fe0
 SHA512:
-  metadata.gz: 2fd0df15ac89fa4ab5c136987158cbe5917b1794014bcfa67785c99200ecb21733c2f504ec286ec008752624e9b9269b751b945fe601e965ca63c1bb8263630c
-  data.tar.gz: 319edc4bc0bcc1a176d7e2c79d73f572814e7deeab10f8a43d636fc61d02378d092ac8395fdba7e429fa2ff5ae8b6e33d3b058afaecaf281841e5c4d3a6ae2f4
+  metadata.gz: 3445192d199b5e6d9814214fac8133c3a7ce19ee3bedb097f3c511655720fdd54dc22f98d1573e0566cb7d9724c36d0d02dce1ef3542326b7afc3a5152571e34
+  data.tar.gz: b513799aaac4c91675e5cd44ed95fb9a852ed6f6f12faf13354ba864c8aa597698899e9aead38bdaadd14d8676095cf83153141c54f70681a63e295d2bd04f12

data/bin/conway_deathmatch

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 
+require 'slop'
+require 'conway_deathmatch'
+
 # process cmdline options
 #
-require 'slop'
 opts = Slop.parse(help: true,
                   banner: true,
                   strict: true,
@@ -21,6 +23,7 @@ opts = Slop.parse(help: true,
   on      'two=',        '[str] points for population "2"'
   on      'three=',      '[str] points for population "3"'
 end
+
 width = opts[:width] || 70
 height = opts[:height] || 40
 shapes = opts[:points] || "acorn 50 18"
@@ -30,9 +33,6 @@ render_continuous = (n.nil? or !opts.silent?)
 
 # create game
 #
-require 'conway_deathmatch'
-require 'conway_deathmatch/shapes'
-
 include ConwayGame
 b = BoardState.new(width, height)
 if opts.multiplayer? or opts[:one] or opts[:two] or opts[:three]

data/lib/conway_deathmatch/board_state.rb

@@ -0,0 +1,120 @@
+module ConwayGame; end         # create namespace
+
+# data structure for the board - 2d array
+# implements standard and multiplayer evaluation
+# static boundaries are treated as dead
+#
+class ConwayGame::BoardState
+  class BoundsError < RuntimeError; end
+
+  DEAD = '.'
+  ALIVE = '0'
+  
+  def self.new_state(x_len, y_len)
+    state = []
+    x_len.times { state << Array.new(y_len, DEAD) }
+    state
+  end
+
+  attr_accessor :multiplayer
+  
+  def initialize(x_len, y_len)
+    # ranges, yay! (exclude_end)
+    @xr = (0...x_len)
+    @yr = (0...y_len)
+    @state = self.class.new_state(x_len, y_len)
+    @multiplayer = false
+  end
+  
+  # Conway's Game of Life transition rules
+  def next_value(x, y)
+    n, birthright = neighbor_stats(x, y)
+    if alive?(x, y)
+      (n == 2 or n == 3) ? birthright : DEAD
+    else
+      (n == 3) ? birthright : DEAD
+    end
+  end
+
+  def in_bounds?(x, y)
+    @xr.include?(x) and @yr.include?(y)
+  end
+  
+  def in_bounds!(x, y)
+    raise(BoundsError, "(#{x}, #{y}) (#{@xr}, #{@yr})") unless in_bounds?(x, y)
+  end
+  
+  # out of bounds considered dead
+  def alive?(x, y)
+    in_bounds?(x, y) and @state[x][y] != DEAD
+  end
+  
+  # population of each neighbor
+  def neighbor_population(x, y)
+    neighbors = Hash.new(0)
+    (x-1..x+1).each { |xn|
+      (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
+      }
+    }
+    neighbors
+  end
+
+  # multiplayer, neighbor count and birthright
+  def neighbor_stats(x, y)
+    if @multiplayer
+      total = 0
+      largest = 0
+      birthright = nil
+      neighbor_population(x, y).each { |sym, cnt|
+        total += cnt
+        if cnt > largest
+          largest = cnt
+          birthright = sym
+        end
+      }
+      [total, birthright]
+    else
+      [neighbor_population(x, y).values.reduce(:+), 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)  } }
+    @state = new_state
+    self
+  end
+
+  # set a single point, raise on OOB
+  def populate(x, y, val = ALIVE)
+    in_bounds!(x, y)
+    @state[x][y] = val
+  end
+  
+  # set several points (2d array), ignore OOB
+  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)
+    }
+    self
+  end
+
+  # for line-based text output, iterate over y-values first (i.e. per row)
+  def render_text
+    @state.transpose.map { |row| row.join }.join("\n")
+  end
+  alias_method :render, :render_text
+
+  # full board scan
+  def population
+    population = Hash.new(0)
+    @state.each { |col| col.each { |val|  population[val] += 1  } }
+    population
+  end
+end

data/lib/conway_deathmatch/shapes.rb

@@ -1,4 +1,4 @@
-require 'conway_deathmatch'
+require 'conway_deathmatch/board_state'
 require 'yaml'
 
 module ConwayGame

data/lib/conway_deathmatch.rb

@@ -1,120 +1,2 @@
-module ConwayGame; end         # create namespace
-
-# data structure for the board - 2d array
-# implements standard and multiplayer evaluation
-# static boundaries are treated as dead
-#
-class ConwayGame::BoardState
-  class BoundsError < RuntimeError; end
-
-  DEAD = '.'
-  ALIVE = '0'
-  
-  def self.new_state(x_len, y_len)
-    state = []
-    x_len.times { state << Array.new(y_len, DEAD) }
-    state
-  end
-
-  attr_accessor :multiplayer
-  
-  def initialize(x_len, y_len)
-    # ranges, yay! (exclude_end)
-    @xr = (0...x_len)
-    @yr = (0...y_len)
-    @state = self.class.new_state(x_len, y_len)
-    @multiplayer = false
-  end
-  
-  # Conway's Game of Life transition rules
-  def next_value(x, y)
-    n, birthright = neighbor_stats(x, y)
-    if alive?(x, y)
-      (n == 2 or n == 3) ? birthright : DEAD
-    else
-      (n == 3) ? birthright : DEAD
-    end
-  end
-
-  def in_bounds?(x, y)
-    @xr.include?(x) and @yr.include?(y)
-  end
-  
-  def in_bounds!(x, y)
-    raise(BoundsError, "(#{x}, #{y}) (#{@xr}, #{@yr})") unless in_bounds?(x, y)
-  end
-  
-  # out of bounds considered dead
-  def alive?(x, y)
-    in_bounds?(x, y) and @state[x][y] != DEAD
-  end
-  
-  # population of each neighbor
-  def neighbor_population(x, y)
-    neighbors = Hash.new(0)
-    (x-1..x+1).each { |xn|
-      (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
-      }
-    }
-    neighbors
-  end
-
-  # multiplayer, neighbor count and birthright
-  def neighbor_stats(x, y)
-    if @multiplayer
-      total = 0
-      largest = 0
-      birthright = nil
-      neighbor_population(x, y).each { |sym, cnt|
-        total += cnt
-        if cnt > largest
-          largest = cnt
-          birthright = sym
-        end
-      }
-      [total, birthright]
-    else
-      [neighbor_population(x, y).values.reduce(:+), 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)  } }
-    @state = new_state
-    self
-  end
-
-  # set a single point, raise on OOB
-  def populate(x, y, val = ALIVE)
-    in_bounds!(x, y)
-    @state[x][y] = val
-  end
-  
-  # set several points (2d array), ignore OOB
-  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)
-    }
-    self
-  end
-
-  # for line-based text output, iterate over y-values first (i.e. per row)
-  def render_text
-    @state.transpose.map { |row| row.join }.join("\n")
-  end
-  alias_method :render, :render_text
-
-  # full board scan
-  def population
-    population = Hash.new(0)
-    @state.each { |col| col.each { |val|  population[val] += 1  } }
-    population
-  end
-end
+require 'conway_deathmatch/board_state'
+require 'conway_deathmatch/shapes'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conway_deathmatch
 version: !ruby/object:Gem::Version
-  version: 0.0.0.5
+  version: 0.0.0.6
 platform: ruby
 authors:
 - Rick Hull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies: []
 description: Deathmatch
 email: 
@@ -19,6 +19,7 @@ extra_rdoc_files: []
 files:
 - bin/conway_deathmatch
 - lib/conway_deathmatch.rb
+- lib/conway_deathmatch/board_state.rb
 - lib/conway_deathmatch/data/shapes.yaml
 - lib/conway_deathmatch/shapes.rb
 homepage: https://github.com/rickhull/conway_deathmatch