rmaze 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9e0430fb1d38141827770a72ae3438a451ed1ca
-  data.tar.gz: 15a61f5a73f128132ed27b0a2f08b2bfaa5bb3e4
+  metadata.gz: 6cd11260d180ed896e3d6c195868dba17329769c
+  data.tar.gz: 4f226f575426c669a51370872b4748dfa901cbf7
 SHA512:
-  metadata.gz: a5a3263729d2f09ded3176dbef2531779c8ebb1f7f3ab38342b473dabd4a94142c1ab7709276c264788eca2f201da5a39728bd4720186fd5da88c096521bfc8a
-  data.tar.gz: 324f2f23e46d31728e3e4e77f71f31fd958aea40b4bf056b348a33b42c9f9213f490c3e0b3fe25bc68bd0d3ad19aacc8a79820fa26cb105162180f4ea106b03d
+  metadata.gz: 9dd1c214c397c6f513f5a7d1fe0b8ebe06803593def2dac27690800bfdf12851f7d61c056e88ee3b3b916fa9b7161c6759c095aa5b242f589fbac2b26ff762be
+  data.tar.gz: 7e77ace8be06484d318a4dcaf47637defa0744459ca3a7c23455026dac6388f38df1bcb9ade840b5e16942d295aacfc6b5e6ffa6b711918c526f608db36c89b3

data/Gemfile

@@ -3,8 +3,10 @@ source 'https://rubygems.org'
 gem 'OptionParser', '~> 0.5.1'
 gem 'rubytree', '~> 0.9.4'
 gem 'rake', '~> 10.1.0'
+gem 'json', '~> 1.8.1'
 
 group :test do
 	gem 'rspec', '~> 3.1.0'
 	gem 'coveralls', require: false
+	gem 'pry'
 end

data/Gemfile.lock

@@ -2,6 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     OptionParser (0.5.1)
+    coderay (1.1.0)
     coveralls (0.8.10)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
@@ -16,8 +17,13 @@ GEM
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     json (1.8.1)
+    method_source (0.8.2)
     mime-types (2.99)
     netrc (0.11.0)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rake (10.1.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -43,6 +49,7 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
+    slop (3.6.0)
     structured_warnings (0.1.4)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
@@ -58,6 +65,8 @@ PLATFORMS
 DEPENDENCIES
   OptionParser (~> 0.5.1)
   coveralls
+  json (~> 1.8.1)
+  pry
   rake (~> 10.1.0)
   rspec (~> 3.1.0)
   rubytree (~> 0.9.4)

data/bin/rmaze

@@ -6,6 +6,7 @@ require 'optparse'
 options = {
 	:width => 10,
 	:height => 10,
+	:format => :ascii,
 	:algorithm => :backtrace
 }
 OptionParser.new do |opts|
@@ -19,6 +20,12 @@ OptionParser.new do |opts|
 	opts.on("-h", "--height height", "Specify the maze height (default: #{options[:height]})") do |height|
 		options[:height] = height
 	end
+	opts.on("-d", "--depth depth", "Specify the maze depth (default: #{options[:depth]})") do |depth|
+		options[:depth] = depth
+	end
+	opts.on("-f", "--format format", "Specify the format output (default: #{options[:format]})") do |format|
+		options[:format] = format.to_sym
+	end
 
 	opts.separator ""
 	opts.separator "Algorithms:"
@@ -27,7 +34,12 @@ OptionParser.new do |opts|
 	end
 end.parse!
 
-maze = Maze.new options[:width], options[:height]
+if not options[:depth]
+	maze = Maze.new options[:width], options[:height]
+else
+	maze = Maze.new options[:width], options[:height], options[:depth]
+end
+
 maze.set_raw_value_all 1
 
 case options[:algorithm]
@@ -36,9 +48,17 @@ when :backtrace
     backtrace.generate
 else
 	$stderr.puts "Error: the algorithm must be set."
-	exit(-1)
+	exit -1
 end
 
-maze.matrix.each_with_index do |row, index|
-    puts row.map(&:to_s).join(' ').gsub('0', ' ').gsub('1', '#')
+case options[:format]
+when :ascii
+	maze.matrix.each do |row|
+		row = [row] if maze.dimensions.length == 2
+		row.each do |depth|
+			puts depth.map(&:to_s).join(' ').gsub('0', ' ').gsub('1', '#')
+		end
+	end
+when :json
+	puts maze.to_json
 end

data/lib/algorithm/backtrace.rb

@@ -18,7 +18,7 @@ class Backtrace
             @maze.set_value *cell.coords.clone.push(0)
         end
 
-		current_cell = @maze.cell *@maze.dimensions.map { |d| rand(d) }
+		current_cell = all_cells[rand(all_cells.length)]
 		visited_cells.push current_cell
 
 		while visited_cells.size != @maze.total_cells

data/lib/maze/maze.rb

@@ -11,7 +11,7 @@ class Maze
 				axis = [value] * dr
 			else
 				(0...dr).each do
-					axis << axis_before.clone
+					axis << Marshal.load(Marshal.dump(axis_before)) # deep clone
 				end
 			end
 			axis_before = axis
@@ -48,7 +48,8 @@ class Maze
     end
 
 	public
-	attr_reader :dimensions, :width_full, :height_full, :matrix
+	attr_accessor :matrix
+	attr_reader :dimensions
 
 	def initialize(*dimensions)
 		@dimensions = dimensions.map { |d| d.to_i }.freeze
@@ -57,6 +58,18 @@ class Maze
 		@hash = @dimensions.reduce(""){ |accum, d| "#{accum}#{d}" }.to_i
 	end
 
+	def self.from_array(matrix)
+		dimensions = []
+		matrix_aux = matrix
+		while matrix_aux.is_a? Array
+			dimensions.push matrix_aux.length
+			matrix_aux = matrix_aux[0]
+		end
+		maze = Maze.new *dimensions
+		maze.matrix = Marshal.load(Marshal.dump(matrix)) # deep clone
+		maze
+	end
+
     def total_cells
         dimensions.reduce(1) { |accum, d| accum*d }
     end
@@ -126,6 +139,10 @@ class Maze
         set_between_cells cell_a, cell_b, 1
     end
 
+	def to_json
+		JSON.unparse @matrix
+	end
+
 	def hash
 		@hash
 	end

data/rmaze.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name        = 'rmaze'
-	s.version     = '2.0.0'
+	s.version     = '2.1.0'
 	s.date        = '2014-10-01'
 	s.licenses    = ["MIT"]
 	s.platform    = Gem::Platform::RUBY
@@ -15,4 +15,5 @@ Gem::Specification.new do |s|
 	s.require_paths = ["lib"]
 	s.add_runtime_dependency 'rubytree', '~> 0.9'
 	s.add_runtime_dependency 'OptionParser', '~> 0.5.1'
+	s.add_runtime_dependency 'json', '~> 1.8.1'
 end

data/spec/maze/maze_cell_spec.rb

@@ -81,7 +81,7 @@ describe MazeCell do
 		expect(maze_cell.has_wall_backward(1)).to be_truthy
 	end
 
-	it '#connected?' do
+	it '#connected? (0)' do
 		coords = [0, 0]
 		@maze.set_raw_value_all 0
 		maze_cell = @maze.cell *coords
@@ -99,7 +99,7 @@ describe MazeCell do
 		expect(maze_cell).to be_connected
 	end
 
-	it '#connected? (3x3)' do
+	it '#connected? (1)' do
         maze = Maze.new 3, 3
 		maze.set_raw_value_all 1
         maze_cell1 = maze.cell 1, 1

data/spec/maze/maze_spec.rb

@@ -1,7 +1,7 @@
 describe Maze do
 	it '#initialize 2d' do
-		width = rand(10) + 15
-		height = rand(10) + 15
+		width = rand(3) + 15
+		height = rand(3) + 15
 		maze = Maze.new(width, height)
 		expect(maze.dimensions[0]).to eq(width)
 		expect(maze.dimensions[1]).to eq(height)
@@ -10,7 +10,7 @@ describe Maze do
 	end
 
 	it '#initialize Nd' do
-		dimensions = ([nil]*(rand(10)+3)).map { |_| 1 + rand(4)  }
+		dimensions = ([nil]*(rand(3)+3)).map { |_| 1 + rand(4)  }
 		maze = Maze.new *dimensions
 		matrix_iter = maze.matrix
 		dimensions.each_with_index do |d, d_index|
@@ -20,13 +20,25 @@ describe Maze do
 		end
 	end
 
+	it '#self.from_array 2d' do
+		maze = Maze.new 4, 8
+		maze.set_raw_value_all 1
+		maze.set_value 1, 1, 0
+		maze_clone = Maze.from_array maze.matrix
+		expect(maze.matrix).to eq(maze_clone.matrix)
+		maze_clone.set_value 1, 1, 1
+		expect(maze.matrix).not_to eq(maze_clone.matrix)
+		maze_clone.set_raw_value_all 0
+		expect(maze.matrix).not_to eq(maze_clone.matrix)
+	end
+
 	it '#total_cells 2d' do
 		maze = Maze.new 4, 8
         expect(maze.total_cells).to eq(32)
 	end
 
 	it '#total_cells Nd' do
-		dimensions = ([nil]*(rand(10)+3)).map { |_| 1 + rand(4)  }
+		dimensions = ([nil]*(rand(3)+3)).map { |_| 1 + rand(4)  }
 		maze = Maze.new *dimensions
         expect(maze.total_cells).to eq(maze.dimensions.reduce(1) { |accum, d| accum*d })
 	end
@@ -63,7 +75,7 @@ describe Maze do
 	end
 
 	it '#coords_to_indices Nd' do
-		dimensions = ([nil]*(rand(10)+3)).map { |_| 1 + rand(4)  }
+		dimensions = ([nil]*(rand(3)+3)).map { |_| 1 + rand(4)  }
 		maze = Maze.new *dimensions
 		coords = dimensions.map { |d| rand(d) }
 		indices = maze.coords_to_indices *coords
@@ -76,7 +88,7 @@ describe Maze do
 	end
 
 	it '#get_raw_value Nd' do
-		dimensions = ([nil]*(rand(10)+3)).map { |_| 1 + rand(4)  }
+		dimensions = ([nil]*(rand(3)+3)).map { |_| 1 + rand(4)  }
 		maze = Maze.new *dimensions
 		coords = dimensions.map { |d| rand(d) }
 		indices = maze.coords_to_indices *coords
@@ -92,7 +104,7 @@ describe Maze do
 	end
 
 	it '#set_raw_value Nd' do
-		dimensions = ([nil]*(rand(10)+3)).map { |_| 1 + rand(4)  }
+		dimensions = ([nil]*(rand(3)+3)).map { |_| 1 + rand(4)  }
 		maze = Maze.new *dimensions
 		coords = dimensions.map { |d| rand(d) }
 		value = rand(99) + 1
@@ -112,7 +124,7 @@ describe Maze do
 	end
 
 	it '#set_raw_value_all Nd' do
-		dimensions = ([nil]*(rand(10)+3)).map { |_| 1 + rand(4)  }
+		dimensions = ([nil]*(rand(3)+3)).map { |_| 1 + rand(4)  }
 		maze = Maze.new *dimensions
 		maze.set_raw_value_all 11
 		coords = maze.dimensions.map { |d| rand(d) }
@@ -126,7 +138,7 @@ describe Maze do
 	end
 
 	it '#get_value Nd' do
-		dimensions = ([nil]*(rand(10)+3)).map { |_| 1 + rand(4)  }
+		dimensions = ([nil]*(rand(3)+3)).map { |_| 1 + rand(4)  }
 		maze = Maze.new *dimensions
 		coords = dimensions.map { |d| rand(d) }
 		expect(maze.get_value(*coords)).to eq(0)
@@ -141,7 +153,7 @@ describe Maze do
 	end
 
 	it '#set_value Nd' do
-		dimensions = ([nil]*(rand(10)+3)).map { |_| 1 + rand(4)  }
+		dimensions = ([nil]*(rand(3)+3)).map { |_| 1 + rand(4)  }
 		maze = Maze.new *dimensions
 		coords = dimensions.map { |d| rand(d) }
 		value = rand(99) + 1
@@ -161,7 +173,7 @@ describe Maze do
 	end
 
 	it '#cell Nd' do
-		dimensions = ([nil]*(rand(10)+3)).map { |_| 1 + rand(4)  }
+		dimensions = ([nil]*(rand(3)+3)).map { |_| 1 + rand(4)  }
 		maze = Maze.new *dimensions
 		coords = dimensions.map { |d| rand(d) }
 		cell = maze.cell *coords
@@ -200,13 +212,27 @@ describe Maze do
         expect(maze.get_raw_value(*indices)).to eq(1)
     end
 
+	it '#to_json 2d' do
+		maze = Maze.new 4, 8
+		maze.set_raw_value_all 1
+		maze.set_value 1, 1, 0
+		expect(maze.to_json).to eq('[[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],[1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]]')
+	end
+
+	it '#to_json 3d' do
+		maze = Maze.new 2, 2, 2
+		maze.set_raw_value_all 1
+		maze.set_value 1, 1, 1, 0
+		expect(maze.to_json).to eq('[[[1,1,1,1,1],[1,1,1,1,1],[1,1,1,1,1],[1,1,1,1,1],[1,1,1,1,1]],[[1,1,1,1,1],[1,1,1,1,1],[1,1,1,1,1],[1,1,1,1,1],[1,1,1,1,1]],[[1,1,1,1,1],[1,1,1,1,1],[1,1,1,1,1],[1,1,1,1,1],[1,1,1,1,1]],[[1,1,1,1,1],[1,1,1,1,1],[1,1,1,1,1],[1,1,1,0,1],[1,1,1,1,1]],[[1,1,1,1,1],[1,1,1,1,1],[1,1,1,1,1],[1,1,1,1,1],[1,1,1,1,1]]]')
+	end
+
 	it '#hash 2d' do
 		maze = Maze.new 4, 8
 		expect(maze.hash).to eq(48)
 	end
 
 	it '#hash Nd' do
-		dimensions = ([nil]*(rand(10)+3)).map { |_| 1 + rand(4)  }
+		dimensions = ([nil]*(rand(3)+3)).map { |_| 1 + rand(4)  }
 		maze = Maze.new *dimensions
 		expect(maze.hash).to eq(dimensions.reduce(""){ |accum, d| "#{accum}#{d}" }.to_i)
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmaze
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Pedro Lira
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.1
 description: Ruby library for maze generation
 email: pedrohml@gmail.com
 executables:
@@ -89,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RMaze