conway_deathmatch 0.3.2.5 → 0.3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c2b0b7a5f1a97dd224542429ceb5d288e61ed2f
-  data.tar.gz: 77d40e41599218e8e315a4661e77e37130a7187a
+  metadata.gz: 37240d180a9787a7ded00f4eaed8fb4e76ae3e39
+  data.tar.gz: 382b541b24dfac1f0a2cbd4ba76a576922ed7aa8
 SHA512:
-  metadata.gz: 5686348c544509c2843456d23e3f296a77e38dd66705851b916a2998cc86e01bcf3310c7f3e86a4642e8a7bb47b8e20ecf2419b296068f6f125ad270e4195be1
-  data.tar.gz: d56b0a39e7a10760eef7abb8a13e6da5a24af3f3080def4e58d9c9bbafc3990a7be5e257d0d4487d967aabd7d53f82af682a918e0e24a1784c4594e69557fbe4
+  metadata.gz: 294b292a4b0442a39e213ee17661c5247969b334da9851999f4b5a770c1a95e68f22f800702950cb5da706def0082c0358ebf34ef6d180262c27ea0261ceb3fc
+  data.tar.gz: 3cf35cc4f6490da0d3f6dfaf55f05ad626bc9906e8533960056a049a158801310bb9df1ccc0665107a7b9d6590ade13b27e38bfb80457370142d106b95542e97

data/README.md

@@ -23,7 +23,7 @@ for space and population.
 This project exists not to compete with CGOLTW but as a supplementary
 project for exploration and learning.  My initial motivation was to make a
 "proving ground" for searching for simple shapes and patterns with high birth
-rates for determining successful CGOLTW strategies. 
+rates for determining successful CGOLTW strategies.
 
 Usage
 ===
@@ -44,14 +44,14 @@ Demo
 
     # defaults to 70x40 board and an acorn shape
     conway_deathmatch
-    
+
     # multiplayer
     conway_deathmatch --one "acorn 30 30" --two "die_hard 20 10"
 
 Available Shapes
 ---
 
-[Definitions](https://github.com/rickhull/conway_deathmatch/blob/master/lib/conway_deathmatch/data/shapes.yaml)
+[Definitions](https://github.com/rickhull/conway_deathmatch/blob/master/lib/conway_deathmatch/shapes/classic.yaml)
 
 * acorn
 * beacon

data/VERSION

@@ -1 +1 @@
-0.3.2.5
+0.3.3.1

data/bin/proving_ground

@@ -0,0 +1,173 @@
+#!/usr/bin/env ruby
+
+require 'slop'
+require 'conway_deathmatch'
+
+# process cmdline options
+#
+opts = Slop.parse(help: true,
+                  banner: true,
+	          strict: true,
+		  optional_arguments: true) do
+  banner 'Usage: proving_ground [options]'
+
+  on 'w', 'width=',      '[int] Board width', as: Integer
+  on      'height=',     '[int] Board height', as: Integer
+  on 'n', 'num_ticks=',  '[int] Max number of ticks to generate', as: Integer
+  on      'silent',      'Only render the final state'
+  on 'p', 'num_points=', '[int] Number of points to generate', as: Integer
+  on 'm', 'max_collisions=', '[int] Max number of collisions', as: Integer
+end
+
+width = opts[:width] || 40
+height = opts[:height] || 40
+n = opts[:num_ticks] || 40
+p = opts[:num_points] || 5
+max_c = opts[:max_collisions] || p ** 2
+
+# answers / output
+pop_final = 0
+pop_final_points = []
+pop_peak = 0
+pop_peak_points = []
+top_score = 0
+top_score_points = []
+
+def conclude!(final, final_points,
+              peak, peak_points,
+              score, score_points,
+              w, h)
+  puts
+  puts "final: #{final}"
+  puts "final_points: #{final_points}"
+  puts "shape_str: #{shape_str(final_points)}"
+  puts
+  puts "peak: #{peak}"
+  puts "peak_points: #{peak_points}"
+  puts "shape_str: #{shape_str(peak_points)}"
+  puts
+  puts "score: #{score}"
+  puts "score_points: #{score_points}"
+  puts "shape_str: #{shape_str(score_points)}"
+
+  exit 0
+end
+
+# choose center point
+# choose next point within 2 units randomly
+def generate_points(num_points, width, height)
+  points = [[width / 2, height / 2]]
+  count = 0
+  while points.length < num_points
+    raise("sanity check failed") if count > num_points * 2
+    count += 1
+    next_p = next_point(points.sample)
+    if next_p[0].between?(0, width - 1) and next_p[1].between?(0, height - 1)
+      points << next_p unless points.include?(next_p)
+    else
+      # debug
+      puts "#{next_p.inspect} out of bounds"
+    end
+  end
+  points
+end
+
+def next_point(prev_point)
+  prev_point.map { |dim| random_within(dim, 2) }
+end
+
+def random_within(x, dist)
+  new_x = x - dist + rand(dist * 2)
+  new_x += 1 if new_x >= x
+  new_x
+end
+
+def shape_str(points)
+  points.map { |point| "p #{point[0]} #{point[1]}" }.join(' ')
+end
+
+Signal.trap("INT") do
+  conclude!(pop_final, pop_final_points,
+            pop_peak, pop_peak_points,
+            top_score, top_score_points,
+            width, height)
+end
+
+include ConwayDeathmatch
+ALIVE = BoardState::ALIVE
+SEEN = {}
+collisions = 0
+
+loop {
+  # populate new board with random points
+  #
+  b = BoardState.new(width, height)
+  points = generate_points(p, width, height)
+
+  # have we seen these points before?
+  #
+  if SEEN[points]
+    collisions += 1
+    puts "X" * collisions
+    break if collisions > max_c
+    next
+  else
+    SEEN[points] = true
+  end
+  b.add_points(points)
+
+  # establish vars outside block
+  #
+  pop = nil
+  peak = 0
+  static_cnt = 0
+  score = 0
+  ticks = 0
+
+  # tick and track population
+  #
+  n.times { |i|
+    b.tick
+    ticks += 1
+
+    # evaluate board
+    #
+    last_pop = pop
+    pop = b.population[ALIVE] || 0
+    score += ticks * pop
+    peak = pop if pop > peak
+
+    # short-circuit static or (soon-to-be) empty boards
+    #
+    break if pop < 3
+    static_cnt = (pop == last_pop ? static_cnt + 1 : 0)
+    break if static_cnt > 3
+  }
+
+  puts "#{pop} (#{peak}) [#{score}]"
+
+  # track the highest populators
+  #
+  if pop > pop_final
+    pop_final = pop
+    pop_final_points = points
+    puts "\tLargest final: #{pop_final}"
+  end
+
+  if peak > pop_peak
+    pop_peak = peak
+    pop_peak_points = points
+    puts "\tLargest peak: #{pop_peak}"
+  end
+
+  if score > top_score
+    top_score = score
+    top_score_points = points
+    puts "\tLargest score: #{top_score}"
+  end
+}
+
+conclude!(pop_final, pop_final_points,
+          pop_peak, pop_peak_points,
+          top_score, top_score_points,
+          width, height)

data/conway_deathmatch.gemspec

@@ -14,8 +14,10 @@ Gem::Specification.new do |s|
     'lib/conway_deathmatch.rb',
     'lib/conway_deathmatch/board_state.rb',
     'lib/conway_deathmatch/shapes.rb',
-    'lib/conway_deathmatch/data/shapes.yaml',
+    'lib/conway_deathmatch/shapes/classic.yaml',
+    'lib/conway_deathmatch/shapes/discovered.yaml',
     'bin/conway_deathmatch',
+    'bin/proving_ground',
     'test/bench_board_state.rb',
     'test/spec_helper.rb',
     'test/test_board_state.rb',

data/lib/conway_deathmatch/shapes/discovered.yaml

@@ -0,0 +1,85 @@
+# discovered via proving_ground
+a4: # boner
+  - [0, 2]
+  - [1, 0]
+  - [1, 1]
+  - [2, 2]
+
+a5:
+  - [0, 1]
+  - [1, 3]
+  - [2, 2]
+  - [3, 0]
+  - [3, 2]
+
+b5:
+  - [0, 0]
+  - [1, 0]
+  - [1, 1]
+  - [1, 2]
+  - [2, 1]
+
+c5:
+  - [0, 1]
+  - [1, 0]
+  - [1, 2]
+  - [2, 2]
+  - [3, 3]
+
+d5: # peace
+  - [0, 2]
+  - [1, 0]
+  - [1, 1]
+  - [2, 1]
+  - [3, 0]
+
+
+e5: # cross (peace + 1)
+  - [0, 1]
+  - [1, 0]
+  - [1, 1]
+  - [1, 2]
+  - [2, 1]
+
+a6: # zed
+  - [0, 2]
+  - [1, 0]
+  - [1, 1]
+  - [2, 3]
+  - [2, 4]
+  - [3, 2]
+
+b6: # trinary
+  - [0, 2]
+  - [1, 1]
+  - [2, 2]
+  - [2, 3]
+  - [3, 2]
+  - [4, 0]
+
+a7:
+  - [0, 3]
+  - [1, 4]
+  - [1, 1]
+  - [2, 0]
+  - [2, 1]
+  - [3, 2]
+  - [4, 1]
+
+b7: # rocket
+  - [0, 0]
+  - [0, 1]
+  - [0, 2]
+  - [1, 3]
+  - [2, 0]
+  - [2, 1]
+  - [2, 2]
+
+c7: # urawizardarry
+  - [0, 0]
+  - [1, 1]
+  - [2, 2]
+  - [3, 2]
+  - [4, 3]
+  - [5, 4]
+  - [5, 5]

data/lib/conway_deathmatch/shapes.rb

@@ -2,9 +2,18 @@ require 'conway_deathmatch/board_state'
 require 'yaml'
 
 module ConwayDeathmatch::Shapes
-  # memoize data/shapes.yaml
-  def self.known
-    @@known ||= YAML.load_file(File.join(__dir__, 'data', 'shapes.yaml'))
+  def self.load_yaml(filename)
+    YAML.load_file(File.join(__dir__, 'shapes', filename))
+  end
+  
+  # memoize shapes/classic.yaml
+  def self.classic
+    @@classic ||= self.load_yaml('classic.yaml')
+  end
+
+  # memoize shapes/discovered.yaml
+  def self.discovered
+    @@disovered ||= self.load_yaml('discovered.yaml')
   end
   
   # parse a string like "acorn 12 22 block 5 0 p 1 2 p 3 4 p 56 78"
@@ -12,8 +21,8 @@ module ConwayDeathmatch::Shapes
   def self.add(board, str, val = BoardState::ALIVE)
     tokens = str.split
     points = []
-    known = self.known
-    
+    classic = self.classic
+
     while !tokens.empty?
       shape = tokens.shift.downcase
       raise "no coordinates for #{shape}" if tokens.length < 2
@@ -23,7 +32,8 @@ module ConwayDeathmatch::Shapes
       when 'p'
         points << [x, y]
       else
-        board.add_points(known.fetch(shape), x, y, val)
+        found = classic[shape] || self.discovered.fetch(shape)
+        board.add_points(found, x, y, val)
       end
     end
     board.add_points(points, 0, 0, val)

data/test/bench_board_state.rb

@@ -28,4 +28,12 @@ describe "BoardState#tick Benchmark" do
     Shapes.add(b, "acorn 50 18")
     n.times { b.tick }
   end
+
+  bench_performance_linear "multiplayer demo", BENCH_TICK_THRESH do |n|
+    b = BoardState.new(70, 40)
+    b.multiplayer = true
+    Shapes.add(b, "acorn 30 30", "1")
+    Shapes.add(b, "die_hard 20 10", "2")
+    n.times { b.tick }
+  end
 end

data/test/test_board_state.rb

@@ -36,7 +36,7 @@ describe BoardState do
     end
 
     it "must recognize \"#{SHAPE_STR}\"" do
-      Shapes.known.fetch(SHAPE).each { |xy_ary|
+      Shapes.classic.fetch(SHAPE).each { |xy_ary|
         @board.value(*xy_ary).must_equal ALIVE
       }
       @board.population.fetch(ALIVE).must_equal POINTS_COUNT

data/test/test_shapes.rb

@@ -2,13 +2,13 @@ require_relative './spec_helper'
 
 describe Shapes do
   it "must recognize #{SHAPE}" do
-    Shapes.known.fetch(SHAPE).must_be_instance_of Array
+    Shapes.classic.fetch(SHAPE).must_be_instance_of Array
   end
 
   it "must confirm #{SHAPE} on the board" do
     @board = BoardState.new(20, 20)
     Shapes.add(@board, SHAPE_STR)
-    Shapes.known.fetch(SHAPE).each { |xy_ary|
+    Shapes.classic.fetch(SHAPE).each { |xy_ary|
       @board.value(*xy_ary).must_equal ALIVE
     }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conway_deathmatch
 version: !ruby/object:Gem::Version
-  version: 0.3.2.5
+  version: 0.3.3.1
 platform: ruby
 authors:
 - Rick Hull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: buildar
@@ -49,11 +49,13 @@ files:
 - Rakefile
 - VERSION
 - bin/conway_deathmatch
+- bin/proving_ground
 - conway_deathmatch.gemspec
 - lib/conway_deathmatch.rb
 - lib/conway_deathmatch/board_state.rb
-- lib/conway_deathmatch/data/shapes.yaml
 - lib/conway_deathmatch/shapes.rb
+- lib/conway_deathmatch/shapes/classic.yaml
+- lib/conway_deathmatch/shapes/discovered.yaml
 - test/bench_board_state.rb
 - test/spec_helper.rb
 - test/test_board_state.rb