willb-mazegen 0.0.0 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.1.0

data/bin/mazegen

@@ -28,19 +28,25 @@ cellsize = PAGE_WIDTH / DEFAULT_WIDTH
 
 page_count = 1
 
+algorithms = {"prim"=>MazePrim, "easy-dfs"=>MazeEasyDFS, "dfs"=>MazeDFS, "rb"=>MazeDFS}
+algorithm = MazeDFS
+
 op = OptionParser.new do |opts|
   opts.banner = "Usage:  mazegen [options] outfile.pdf"
   
   opts.on("-w", "--width COLS", "width of maze in cells (defaults to 67)") do |w| 
     width = w.to_i
-    cellsize = PAGE_WIDTH / width
-    height = PAGE_HEIGHT / cellsize
+    cellsize = PAGE_WIDTH.to_f / width
+    height = (PAGE_HEIGHT / cellsize).to_i
   end
   
   opts.on("-p", "--pagecount NUM", "number of mazes to put in the output document") do |p| 
     page_count = p.to_i
   end
   
+  opts.on("-a", "--algorithm ALGO", "algorithm for maze generation (#{algorithms.keys.join(", ")}; default is dfs)") do |alg|
+    algorithm = algorithms[alg.downcase]
+  end
 end
 
 begin
@@ -56,7 +62,14 @@ if ARGV.size < 1
   exit
 end
 
-m = Maze.new(width, height)
+if algorithm == nil
+  puts "You must pick a valid maze generation algorithm."
+  puts "Valid algorithms are #{algorithms.keys.join(", ")}."
+  puts op
+  exit
+end
+
+m = algorithm.new(width, height)
 
 Prawn::Document.generate(ARGV[0]) do
   while page_count > 0

data/lib/willb-mazegen/cellgraph.rb

@@ -1,5 +1,5 @@
 # cellgraph.rb is licensed under the Apache Software License, version 2.0 
-# and copyright (c) 2010 William Benton (http://willbenton.com)
+# and Copyright (c) 2010 William Benton (http://willbenton.com)
 
 # An undirected, unweighted graph of cells on a square grid; edges 
 # indicate spaces, non-edges (between neighbors) indicate walls
@@ -23,7 +23,11 @@ class CellGraph
   end
 
   alias add_edge add_edges
-
+  
+  def size
+    return x * y
+  end
+  
   def edges_from(node)
     @node_edges[node].map {|dest| [node, dest]}
   end
@@ -56,7 +60,7 @@ class CellGraph
   
   private
   def init_coords
-    Hash[*nodenums.zip(nodenums.map {|num| [num % @x, num / @x]}).flatten(1)]
+    Hash[*nodenums.zip(nodenums.map {|num| [num % @x, num / @x]}).flatten_once]
   end
 
   def init_edges
@@ -66,7 +70,7 @@ class CellGraph
   end
 
   def init_neighbors
-    Hash[*nodenums.zip(nodenums.map {|num| gen_neighbors(num)}).flatten(1)]
+    Hash[*nodenums.zip(nodenums.map {|num| gen_neighbors(num)}).flatten_once]
   end
 
   def nodenums

data/lib/willb-mazegen/maze.rb

@@ -1,9 +1,12 @@
 # maze.rb is licensed under the Apache Software License, version 2.0 
-# and copyright (c) 2010 William Benton (http://willbenton.com)
+# and Copyright (c) 2010 William Benton (http://willbenton.com)
 
-class Maze
+# common infrastructure
+module MazeBase
   def initialize(x,y)
     @cg = CellGraph.new(x,y)
+    @startcell = 0
+    @endcell = (@cg.x * @cg.y) - 1
   end
   
   attr_reader :cg
@@ -12,18 +15,6 @@ class Maze
     [@cg.x,@cg.y]
   end
   
-  def gen
-    reset
-    while @walls.size > 0
-      source,dest = @walls.delete_at(rand(@walls.size))
-      unless @maze_cells.include? dest
-        @maze_cells << dest
-        @cg.add_edge(source=>dest)
-        @walls = @walls + walls_for(dest)
-      end
-    end
-  end
-  
   def walls_for(cell)
     @cg.neighbors(cell).map {|nbc| [cell,nbc]} - @cg.edges_from(cell)
   end
@@ -44,16 +35,78 @@ class Maze
     
     result
   end
+end
+
+# Prim algorithm maze generator
+class MazePrim
+  include MazeBase
   
+  def gen
+    reset
+    while @walls.size > 0
+      source,dest = @walls.delete_at(rand(@walls.size))
+      unless @maze_cells.include? dest
+        @maze_cells << dest
+        @cg.add_edge(source=>dest)
+        @walls = @walls + walls_for(dest)
+      end
+    end
+  end
+
   private
   def reset
     @cg.reset_edges
     
     @maze_cells = (Set.new << 0)
     @walls = walls_for(0)
+  end
+end
+
+# recursive-backtracking DFS maze generator
+class MazeDFS
+  include MazeBase
+
+  def gen
+    reset
+    gen_from(first_cell)
+  end
+  
+  private
+  def first_cell
+    rand(cg.x * cg.y)
+  end
+  
+  def reset
+    @cg.reset_edges
     
-    @startcell = 0
-    @endcell = (@cg.x * @cg.y) - 1
+    @maze_cells = SortedSet.new
+    @neighbor_set = Hash.new {|h,cell| h[cell] =  @cg.neighbors(cell).reject {|x| @maze_cells.include?(x)}; h[cell]}
+  end
+
+  def gen_from(initial_cell)
+    worklist = [initial_cell]
+    while not worklist.empty?
+      cell = worklist.last
+      my_neighbor_set = @neighbor_set[cell]
+      
+      if my_neighbor_set.empty?
+        worklist.pop
+        unless worklist.empty?
+          @neighbor_set[worklist.last].reject! {|x| @maze_cells.include?(x)}
+        end
+      else
+        dest = my_neighbor_set.delete_at(rand(my_neighbor_set.size))
+        @cg.add_edge(cell=>dest)
+        worklist << dest
+        @maze_cells << dest
+      end
+    end
   end
 end
 
+class MazeEasyDFS < MazeDFS
+  private
+  def first_cell
+    @startcell
+  end
+end

data/lib/willb-mazegen/mazerenderer.rb

@@ -1,5 +1,13 @@
 # mazerenderer.rb is licensed under the Apache Software License, version 2.0 
-# and copyright (c) 2010 William Benton (http://willbenton.com)
+# and Copyright (c) 2010 William Benton (http://willbenton.com)
+
+class Array
+  def flatten_once
+    self.inject([]) do |acc, val|
+      val.is_a?(Array) ? acc.concat(val) : acc << val
+    end
+  end
+end
 
 class MazeRenderer
   def initialize(m, cellsize)
@@ -34,6 +42,6 @@ class MazeRenderer
   private
   def gen_corners(x,y)
     pairs = {:ul=>[x,y],:ur=>[x+1,y],:bl=>[x,y+1],:br=>[x+1,y+1]}.map {|key,val| [key,val.map{|p| p * @cellsize}]}
-    Hash[*pairs.flatten(1)]
+    Hash[*pairs.flatten_once]
   end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: willb-mazegen
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  hash: 27
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Will Benton
@@ -9,29 +15,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-06 00:00:00 -06:00
+date: 2012-07-06 00:00:00 -05:00
 default_executable: mazegen
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: prawn
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 7
+        - 0
         version: 0.7.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: Simple PDF maze generator, based on spanning trees.  Can generate one or many mazes of different complexities.
 email: willbenton@gmail.com
 executables: 
@@ -58,29 +76,34 @@ homepage: http://github.com/willb/mazegen
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple PDF maze generator
-test_files: 
-- spec/mazegen_spec.rb
-- spec/spec_helper.rb
+test_files: []
+