cellular_automata 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 891c6c36e259e19ad44dad69cdfef0336058978a
-  data.tar.gz: 4e5898cdadcdc8031601e70f4da409b8157fdbb1
+  metadata.gz: 0237b3c22f9d23179fc50a5c88bc5217ce95025e
+  data.tar.gz: 93bcb9d782c3ec0643fdee8b9e04d0de01c62a3c
 SHA512:
-  metadata.gz: 4e7ae0a28aecd0030faefaa03fefe2671ed7d0a1e477190d48506c2178d5a5e9a9322e827fa3f52b21bd4024370ffc2b6448bc8741f49b0fdc4f7a705d6d632e
-  data.tar.gz: e59aaed8f24f32467b4c069c3df8a40e458d64cb872703f17c553933ec6a469a2b1f1696598dc7bb48dadf4425abd335f1f96929abb39cdbd9e1e2db7ec6f26a
+  metadata.gz: b0ae054a68622f16753da6ca3968a20c64af2ea6af76a342a5223f10f435553cc71be98315f607b92f159cf7e29eb435411253f5a626dc13e96d9ba8855ab8f9
+  data.tar.gz: dc06e35c815e74eeed6ba5048f352410937d8b51e67d827d7f7b3112c83cc087d3196f5910e357900fd61693d1f9227734cb316652be05de7c3fabe0f976acd7

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 *.gem
+/lib/*.bundle

data/Rakefile

@@ -1 +1,4 @@
 require "bundler/gem_tasks"
+require 'rake/extensiontask'
+spec = Gem::Specification.load('cellular_automata.gemspec')
+Rake::ExtensionTask.new('cellular_c', spec)

data/bin/cell_console

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+require 'cellular_automata'
+require 'optparse'
+require 'byebug'
+require 'pry'
+
+width = 120
+height = 30
+rule = 'B3S2'
+board = CellularAutomata::Board.new(width: width, height: height, rule: rule)
+board.tick!
+board.tick!
+puts board.to_s
+state = board.state
+binding.pry
+exit

data/bin/cell_gif

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+
+require 'cellular_automata'
+require 'optparse'
+require 'gosu'
+
+def opts_from_cli
+  options = {}
+  opt_parser = OptionParser.new do |opts|
+    opts.program_name = File.basename(__FILE__)
+    opts.banner = "#{opts.program_name} [options] RULE"
+    opts.on('-w WIDTH', '--width WIDTH', 'Set width') { |w| options[:width] = w.to_i }
+    opts.on('-h HEIGHT', '--height HEIGHT', 'Set height') { |h| options[:height] = h.to_i }
+    opts.on('-s SCALE', '--scale SCALE', 'Factor by which to scale game board') { |s| options[:scale] = s.to_i }
+    opts.on('-c WIDTH', '--cell-width WIDTH', 'Factor by which to scale cells', 'Use 1 for an \'LED\' look',
+            'Use 2 for no borders around cells', 'or choose anything in between') {|w| options[:cell_scale] = w.to_f }
+    opts.on('-f FRAMES', '--frames FRAMES', 'Number of frames to write') { |f| options[:frames] = f.to_i }
+    opts.on('-v', '--version', 'Print version information') do
+      puts "#{File.basename(__FILE__)} #{CellularAutomata::VERSION}"
+      exit true
+    end
+    opts.on('--help', 'Display this screen') do
+      puts opts
+      exit true
+    end
+  end
+  begin
+    opt_parser.parse!
+  rescue OptionParser::InvalidOption => e
+    puts e.message
+    exit false
+  end
+  options
+end
+
+opts = opts_from_cli
+opts[:width]  ||= 160
+opts[:height] ||= 120
+opts[:scale] ||= 1
+opts[:cell_scale] ||= 2.0
+opts[:cell_scale] = 2.0 if opts[:cell_scale] > 2.0
+opts[:cell_scale] = 1.0 if opts[:cell_scale] < 1.0
+opts[:frames] ||= 100
+rule = ARGV[0] || 'B3S2'
+opts[:rule] = rule
+
+trap 'SIGINT' do
+  exit
+end
+
+CellularAutomata::GifWriter.write(opts)
+exit

data/cellular_automata.gemspec

@@ -4,26 +4,29 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cellular_automata/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'cellular_automata'
+  spec.name          = "cellular_automata"
   spec.version       = CellularAutomata::VERSION
-  spec.authors       = ['Forrest Fleming']
-  spec.email         = ['ffleming@gmail.com']
+  spec.authors       = ["Forrest Fleming"]
+  spec.email         = ["ffleming@gmail.com"]
 
   spec.summary       = %q{A simulation of cellular automata}
   spec.description   = %q{A set of 0-player games, of which Conway's Game of Life is a member.}
-  spec.homepage      = 'https://github.com/ffleming/cellular_automata'
+  spec.homepage      = "https://github.com/ffleming/cellular_automata"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = 'bin'
+  spec.bindir        = "bin"
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
   spec.license       = 'MIT'
 
-  spec.add_runtime_dependency     'gosu', '~> 0.9'
-  spec.add_development_dependency 'releasy', '~> 1', '>= 1.8'
-  spec.add_development_dependency 'bundler', '~> 1', '>= 1.8'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.extensions << 'ext/cellular_c/extconf.rb'
+
+  spec.add_runtime_dependency "gosu", '~> 0', '>= 0.9'
+  spec.add_runtime_dependency "rmagick", '~> 2', '>= 2.15'
+  spec.add_development_dependency "bundler", "~> 1", ">= 1.8"
+  spec.add_development_dependency "rake-compiler", '~> 0', '>= 0.9'
+  spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'byebug', '~> 4'
   spec.add_development_dependency 'pry-byebug', '~> 3.1'

data/ext/cellular_c/cellular_c.c

@@ -0,0 +1,76 @@
+#include <ruby.h>
+#include <stdio.h>
+
+VALUE CellularC = Qnil;
+void Init_cellular_c();
+int cell_value(VALUE, int);
+int neighbor_population_of(VALUE, int, int);
+VALUE method_dup_state(VALUE, VALUE);
+VALUE method_next_state(VALUE, VALUE, VALUE);
+
+void Init_cellular_c() {
+    CellularC = rb_define_module("CellularC");
+    rb_define_singleton_method(CellularC, "dup_state", method_dup_state, 1);
+    rb_define_singleton_method(CellularC, "next_state", method_next_state, 2);
+}
+
+int cell_value(VALUE rule, int num_neighbors) {
+    VALUE rule_array = rb_iv_get(rule, "@rule_array");
+    VALUE result = rb_ary_entry(rule_array, num_neighbors);
+    VALUE live = ID2SYM(rb_intern("birth"));
+    VALUE die = ID2SYM(rb_intern("die"));
+    if(result == die) {
+        return 0;
+    } else if(result == live) {
+        return 1;
+    }
+    return -1;
+}
+
+int neighbor_population_of(VALUE state, int x, int y) {
+    int height = (int)RARRAY_LEN(state);
+    int width  = (int)RARRAY_LEN(rb_ary_entry(state, 0));
+    int min_x = x > 1 ? x - 1 : 0;
+    int max_x = x < width - 2 ? x + 1 : width - 1;
+    int min_y = y > 1 ? y - 1 : 0;
+    int max_y = y < height - 2 ? y + 1 : height - 1;
+    int ret = 0;
+
+    for(int row = min_y; row <= max_y; row++) {
+        VALUE row_array = rb_ary_entry(state, row);
+        for(int col = min_x; col <= max_x; col++) {
+            int alive = FIX2INT(rb_ary_entry(row_array, col));
+            if((alive == 1) && ((x != col) || (y != row))) {
+                ret += 1;
+            }
+        }
+    }
+    return ret;
+}
+
+VALUE method_next_state(VALUE self, VALUE state, VALUE rule) {
+  VALUE next_state = method_dup_state(self, state);
+  int height = (int)RARRAY_LEN(state);
+  int width  = (int)RARRAY_LEN(rb_ary_entry(state, 0));
+  for(int row = 0; row < height; row++) {
+      VALUE row_array = rb_ary_entry(next_state, row);
+      for(int col = 0; col < width; col++) {
+          int new_value = cell_value(rule, neighbor_population_of(state, col, row));
+          if(new_value == -1) {
+            continue;
+          }
+          rb_ary_store(row_array, col, INT2FIX(new_value));
+      }
+  }
+  return next_state;
+}
+
+VALUE method_dup_state(VALUE self, VALUE state) {
+    int height = (int)RARRAY_LEN(state);
+    VALUE dup =  rb_ary_new2(height);
+    for(int y = 0; y < height; y++) {
+        VALUE row = rb_ary_dup(rb_ary_entry(state, y));
+        rb_ary_push(dup, row);
+    }
+    return dup;
+}

data/ext/cellular_c/extconf.rb

@@ -0,0 +1,6 @@
+# ext/extconf.rb
+require 'mkmf'
+extension_name = 'cellular_c'
+dir_config(extension_name)
+create_header
+create_makefile(extension_name)

data/lib/cellular_automata/board.rb

@@ -1,10 +1,13 @@
 class CellularAutomata::Board
-  attr_reader :width, :height, :rule
-  def initialize(rule: 'B3S2', width: 80, height: 20)
+  attr_reader :width, :height, :rule, :history, :state
+  def initialize(rule: 'B3S2', width: 80, height: 20, max_history: 2)
     @height = height
     @width  = width
     @state  = build_array
     @rule   = CellularAutomata::Rule.new(rule)
+    @history = []
+    @max_history = max_history
+    max_history.times { history.push build_array }
     seed!
   end
 
@@ -14,7 +17,7 @@ class CellularAutomata::Board
     @state.each do |row|
       ret << "|"
       row.each do |cell|
-        ret << cell.to_s
+        ret << (cell == 0 ? ' ' : '*' )
       end
       ret << "|\n"
     end
@@ -22,17 +25,24 @@ class CellularAutomata::Board
   end
 
   def tick!
-    next_state = Marshal.load(Marshal.dump @state)
-    each_cell do |cell|
-      next_state[cell.y][cell.x].send rule.process(neighbor_population_of cell) #= next_cell #cell.send(rule.process(adj_pop))
-    end
+    next_state = CellularC.next_state(@state, rule)
+    history.unshift CellularC.dup_state(@state)
+    history.pop if history.length > @max_history
     @state = next_state
   end
 
+  def kill(array: , x: , y: )
+    array[y][x] = 0
+  end
+
+  def live(array: , x: , y: )
+    array[y][x] = 1
+  end
+
   def each_cell
     (0..height-1).each do |y|
       (0..width-1).each do |x|
-        yield @state[y][x]
+        yield(x, y)
       end
     end
   end
@@ -40,7 +50,7 @@ class CellularAutomata::Board
   private
 
   def seed!
-    each_cell { |c| c.live! if rand < 0.1 }
+    each_cell { |x, y| @state[y][x] = 1 if rand < 0.1 }
   end
 
   def build_array
@@ -48,29 +58,24 @@ class CellularAutomata::Board
     (0..height-1).each do |y|
       arr[y] = []
       (0..width-1).each do |x|
-        arr[y][x] = CellularAutomata::Cell.new(row: y, column: x, alive: false)
+        arr[y][x] = 0
       end
     end
     return arr
   end
 
-  def neighbor_population_of(cell)
-    neighbors_of(cell).select(&:alive?).length
-  end
-
-  def cell_at(y, x)
-    return nil if x  < 0 || y < 0
-    return nil if y > @state.length-1
-    return nil if x > @state[0].length-1
-    return @state[y][x]
-  end
-
-  def neighbors_of(cell)
-    y = cell.y ; x = cell.x
-    [ cell_at(y-1, x-1), cell_at(y-1, x  ), cell_at(y-1, x+1),
-      cell_at(y,   x+1),                    cell_at(y  , x-1),
-      cell_at(y+1, x-1), cell_at(y+1, x  ), cell_at(y+1, x+1) ].compact
+  def neighbor_population_of(x: , y: )
+    ret = 0
+    min_x = x > 1 ? x - 1 : 0
+    max_x = x < width - 2 ? x + 1 : width - 1
+    min_y = y > 1 ? y - 1 : 0
+    max_y = y < height - 2 ? y + 1 : height - 1
+    (min_y..max_y).each do |row|
+      (min_x..max_x).each do |col|
+        ret += 1 unless ((x == col && y == row) || @state[row][col] == 0)
+      end
+    end
+    ret
   end
-
 end
 

data/lib/cellular_automata/gif_writer.rb

@@ -0,0 +1,56 @@
+module CellularAutomata::GifWriter
+  class << self
+  def write(opts={})
+    @scale = opts[:scale]
+    @cell_width = scale**opts[:cell_scale]
+    @board = CellularAutomata::Board.new(width: opts[:width]/scale, height: opts[:height]/scale, rule: opts[:rule])
+    @gif = Magick::ImageList.new
+    @width = opts[:width]
+    @height = opts[:height]
+    @frames = opts[:frames]
+    write_gif('test.gif')
+  end
+
+  private
+
+  attr_reader :board, :scale, :cell_width, :frames, :writer, :height, :width
+
+  def write_gif(outfile)
+    frames.times do |i|
+      draw_frame
+      board.tick!
+    end
+    @gif.write(outfile)
+  end
+
+  def draw_frame
+    writer = Magick::Draw.new
+    frame = Magick::Image.new(width, height) do
+      self.background_color = '#000000'
+    end
+    board.each_cell do |cell|
+      prev_1 = board.history[0][cell.y][cell.x]
+      prev_2 = board.history[1][cell.y][cell.x]
+      color = '#000000'
+      if cell.alive?
+        color = '#FFFF00'
+      elsif prev_1.alive?
+        color = '#AAAA00'
+      elsif prev_2.alive?
+        color = '#444400'
+      end
+      writer.stroke color
+      writer.fill color
+      x1 = cell.x * scale**2
+      y1 = cell.y * scale**2
+      x2 = x1 + cell_width
+      y2 = y1 + cell_width
+      writer.rectangle(x1, y1, x2, y2)
+    end
+    writer.draw(frame)
+    @gif << frame
+    print '.'
+  end
+  end
+end
+

data/lib/cellular_automata/gui_window.rb

@@ -14,9 +14,18 @@ class CellWindow < Gosu::Window
   end
 
   def draw
-    board.each_cell do |cell|
-      color = cell.alive? ? Gosu::Color::YELLOW : Gosu::Color::BLACK
-      Gosu.draw_rect(cell.x * scale**2, cell.y * scale**2, cell_width, cell_width, color, 0, :default)
+    board.each_cell do |x, y|
+      prev_1 = board.history[0][y][x] == 1
+      prev_2 = board.history[1][y][x] == 1
+      color = Gosu::Color::BLACK
+      if board.state[y][x] == 1
+        color = Gosu::Color.argb(0xff_FFFF00)
+      elsif prev_1
+        color = Gosu::Color.argb(0xff_AAAA00)
+      elsif prev_2
+        color = Gosu::Color.argb(0xff_444400)
+      end
+      Gosu.draw_rect(x * scale**2, y * scale**2, cell_width, cell_width, color, 0, :default)
     end
   end
 

data/lib/cellular_automata/rule.rb

@@ -1,27 +1,24 @@
 class CellularAutomata::Rule
   def initialize(rule_string)
-    @rule_hash = process_rule! rule_string
+    rules = rule_string.downcase.scan(/[bs]\d+/)
+    raise ArgumentError.new("Invalid rule string #{rule_string}") if rules.length != 2
+    birth = rules.select {|s| s.start_with?('b')}.first
+    survive = rules.select {|s| s.start_with?('s')}.first
+    @rule_array = rules_array_from birth: birth, survive: survive
   end
 
   def process(input)
-    return @rule_hash[input] || raise(ArgumentError.new("I don't know what to do with #{input.class} #{input}"))
-  end
-
-  def process2(input)
-    @rule_hash[input] != :die!
+    return @rule_array[input.to_i] || raise(ArgumentError.new("I don't know what to do with #{input.class} #{input}"))
   end
 
   private
 
-  def process_rule!(rule_string)
-    rules = rule_string.scan(/[BS]\d+/)
-    raise ArgumentError.new("Invalid rule string #{rule_string}") if rules.length != 2
-    birth_string = rules.select {|s| s.start_with?('B')}.first
-    survive_string = rules.select {|s| s.start_with?('S')}.first
-    (birth, survive) = [birth_string, survive_string].map { |s| s[1..-1].split('').map(&:to_i) }
-    death = ((0..8).to_a - birth) - survive
-    {live!: birth, survive!: survive, die!: death}.each_with_object({}) do |(k, v), ret|
-      v.each {|int| ret[int] = k}
+  def rules_array_from(birth: , survive: )
+    ('0'..'8').each_with_object([]) do |i_str, ret|
+      val = :die
+      val = :survive if survive.include? i_str
+      val = :birth if birth.include? i_str
+      ret << val
     end
   end
 end

data/lib/cellular_automata/version.rb

@@ -1,3 +1,3 @@
 module CellularAutomata
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/lib/cellular_automata.rb

@@ -2,11 +2,14 @@ require 'pry'
 require 'byebug'
 require 'pry-byebug'
 require 'gosu'
+require 'rmagick'
 require "cellular_automata/version"
 require "cellular_automata/cell"
 require "cellular_automata/rule"
 require "cellular_automata/board"
 require "cellular_automata/gui_window"
+require "cellular_automata/gif_writer"
+require 'cellular_c.bundle'
 
 module CellularAutomata
 end

metadata

@@ -1,20 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: cellular_automata
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Forrest Fleming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-24 00:00:00.000000000 Z
+date: 2015-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
@@ -22,28 +25,31 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: releasy
+  name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
+        version: '2.15'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.15'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -64,6 +70,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -125,8 +151,11 @@ email:
 - ffleming@gmail.com
 executables:
 - cell
+- cell_console
+- cell_gif
 - cell_gui
-extensions: []
+extensions:
+- ext/cellular_c/extconf.rb
 extra_rdoc_files: []
 files:
 - ".gitignore"
@@ -136,11 +165,16 @@ files:
 - README.md
 - Rakefile
 - bin/cell
+- bin/cell_console
+- bin/cell_gif
 - bin/cell_gui
 - cellular_automata.gemspec
+- ext/cellular_c/cellular_c.c
+- ext/cellular_c/extconf.rb
 - lib/cellular_automata.rb
 - lib/cellular_automata/board.rb
 - lib/cellular_automata/cell.rb
+- lib/cellular_automata/gif_writer.rb
 - lib/cellular_automata/gui_window.rb
 - lib/cellular_automata/rule.rb
 - lib/cellular_automata/version.rb
@@ -164,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: A simulation of cellular automata