automaze 0.0.2 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.4

data/automaze.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{automaze}
-  s.version = "0.0.2"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Toshiyuki Hirooka"]

data/lib/algorithms/boutaoshi.rb

@@ -1,6 +1,13 @@
 # coding: utf-8
 
 module Boutaoshi
+  def init_panels
+    each_panels do |panel, x, y|
+      panel.set_kind(:floor)
+      panel.set_kind(:wall) if post?(x,y)
+    end
+  end
+
   def generate
     init_panels
 
@@ -17,13 +24,6 @@ module Boutaoshi
     end
   end
 
-  def init_panels
-    each_panels do |panel, x, y|
-      panel.set_kind(:floor)
-      panel.set_kind(:wall) if post?(x,y)
-    end
-  end
-
   def post?(x,y)
     ( x % 2 ) == 1 && ( y % 2 ) == 1
   end

data/lib/algorithms/dug_tunnels.rb

@@ -8,6 +8,7 @@ module DugTunnels
   end
 
   def generate
+    @dug_count = 0
     init_panels
 
     # start point
@@ -55,17 +56,13 @@ module DugTunnels
   end
 
   def dug_all?
-    each_panels do |panel, x, y|
-      if ( x % 2 ) == 0 && ( y % 2 ) == 0
-        return false if panel.wall?
-      end
-    end
-    return true
+    @dug_count >= (size_x+2)* (size_y+2) / 4 - 1
   end
 
   def dig(x, y, dir)
     xy = next_xy(x, y, dir)
     panels(*xy).set_kind(:floor)
+    @dug_count += 1
 
     diff = [xy[0] - x, xy[1] - y]
     if diff[0] == 0

data/lib/automaze.rb

@@ -42,7 +42,7 @@ module Automaze
 
       @size_x = options.delete(:size_x) || 30
       @size_y = options.delete(:size_y) || 20
-      self.class.include_algorithm options.delete(:algorithm) || DEFAULT_ALGORITHM
+      self.class.include_algorithm(options.delete(:algorithm) || DEFAULT_ALGORITHM)
       self.generate # included algorithm
     end
     attr_reader :size_x
@@ -110,18 +110,15 @@ module Automaze
     end
 
     def to_s
-      str = ""
-      (-1..@size_y+1).each {|y|
-        (-1..@size_x+1).each {|x|
+      (-1..@size_y+1).map {|y|
+        (-1..@size_x+1).map {|x|
           if panels(x,y).wall?
-            str += "XX"
+            "XX"
           else
-            str += "  "
+            "  "
           end
-        }
-        str += "\n"
-      }
-      return str
+        }.join + "\n"
+      }.join
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Toshiyuki Hirooka