nonograms 0.1.0 → 0.1.1

data/README.md

@@ -54,7 +54,6 @@ You can solve this example when you write the code below
 
     > vertical = [[1], [2, 1], [1], [], [1, 1]]
     > horizontal = [[1], [2, 1], [1], [1, 1]]
-    > @nonograms = Nonograms.new(vertical, horizontal)
-    > @nonograms.solve
-    > @nonograms.results #=> ["01000"+"01101"+"10000"+"01001", ...]
+    > @nonograms = Nonograms::Solver.new(vertical, horizontal)
+    > @nonograms.solve #=> ["01000"+"01101"+"10000"+"01001", ...]
 

data/lib/nonograms.rb

@@ -1,100 +1,3 @@
 # encoding: utf-8
 require "nonograms/version"
-
-# class can solve the puzzle game Nonograms
-class Nonograms
-
-  attr_reader :results
-
-  def initialize(vertical, horizontal)
-    @vertical = vertical
-    @horizontal = horizontal
-    @amount_row = horizontal.length
-    @amount_column = vertical.length
-    @puzzle = []
-    @amount_row.times do |index|
-      @puzzle << [0]*@amount_column
-    end
-    @results = []
-  end
-
-  def solve(row = 0, column = 0)
-    if vertical_acceptable?(row, column) and horizontal_acceptable?(row, column)
-      if row == @amount_row-1 and column == @amount_column-1
-        @results <<  Marshal.load(Marshal.dump(@puzzle)).flatten.join("")
-        return @amount_column
-      end
-      next_cell_set(0, row, column)
-      next_cell_set(1, row, column)
-    end
-  end
-
-private
-
-  def next_cell_set(value, row, column)
-    new_row = (row*@amount_column + column + 1) / @amount_column
-    new_column = (row*@amount_column + column + 1) % @amount_column
-    @puzzle[new_row][new_column] = value
-    solve(new_row, new_column)
-    @puzzle[new_row][new_column] = 0
-  end
-
-  # count values '1' in vertical
-  def count_vertical(column)
-    result, counter = [], 0
-    @amount_row.times do |index|
-      if @puzzle[index][column] == 1
-        counter += 1
-      else
-        result << counter unless counter == 0
-        counter = 0
-      end
-      result << counter if index == @amount_row-1 and not counter == 0
-    end
-    result
-  end
-
-  # count values '1' in horizontal
-  def count_horizontal(row)
-    result, counter = [], 0
-    @amount_column.times do |index|
-      if @puzzle[row][index] == 1
-        counter += 1
-      else
-        result << counter unless counter == 0
-        counter = 0
-      end
-      result << counter if index == @amount_column-1 and not counter == 0
-    end
-    result
-  end
-
-  def vertical_acceptable?(row, column)
-    unless row == @amount_row-1
-      vector_acceptable?( @vertical[column], count_vertical(column) )
-    else
-      return  ( @vertical[column] == count_vertical(column) )
-    end
-  end
-
-  def horizontal_acceptable?(row, column)
-    unless column == @amount_column-1
-      vector_acceptable?( @horizontal[row], count_horizontal(row) )
-    else
-      return ( @horizontal[row] == count_horizontal(row))
-    end
-  end
-
-  def vector_acceptable?(origin, piece)
-    return false if piece.length > origin.length
-    piece.each_with_index do |value, index|
-      if index == piece.length-1
-         return false unless origin[index] >= piece[index]
-       else
-         return false unless origin[index] == piece[index]
-       end
-     end
-     return true
-  end
-
-end
+require "nonograms/solver"

data/lib/nonograms/solver.rb

@@ -0,0 +1,104 @@
+# encoding: utf-8
+module Nonograms
+
+  # class can solve the puzzle game Nonograms
+  class Solver
+
+    attr_reader :results
+
+    def initialize(vertical, horizontal)
+      @vertical = vertical
+      @horizontal = horizontal
+      @amount_row = horizontal.length
+      @amount_column = vertical.length
+      @puzzle = empty_puzzle
+      @results = []
+    end
+
+    # solve the nonograms
+    def solve
+      return @results unless @results.empty?
+      run_recursion
+      @results
+    end
+
+  private
+
+    # get the matrix with cells values zero
+    def empty_puzzle
+      result = []
+      @amount_row.times do |index|
+        result << [0]*@amount_column
+      end
+      result
+    end
+
+    # run recursion from fixed position row and column if @puzzle is acceptable
+    def run_recursion(row = 0, column = 0)
+      return unless vertical_acceptable?(row, column) and horizontal_acceptable?(row, column)
+      if row == @amount_row-1 and column == @amount_column-1
+        @results << Marshal.load(Marshal.dump(@puzzle)).flatten.join("")
+        return nil
+      end
+      next_cell_set(0, row, column)
+      next_cell_set(1, row, column)
+    end
+
+    def next_cell_set(value, row, column)
+      new_row = (row*@amount_column + column + 1) / @amount_column
+      new_column = (row*@amount_column + column + 1) % @amount_column
+      @puzzle[new_row][new_column] = value
+      run_recursion(new_row, new_column)
+      @puzzle[new_row][new_column] = 0
+    end
+
+    # count amount values '1' in vector
+    # for example:
+    # * vector : [0, 1, 1, 0, 0, 1, 0]
+    # * return: [2, 1]
+    def count_vector(vector)
+      vector.join("").scan(/[1]+/).map{|element| element.length}
+    end
+
+    # count amount values '1' in vertical vector
+    def count_vertical(column)
+      vertical_vector = @puzzle[0...@amount_row].map{|vector| vector[column]}
+      count_vector(vertical_vector)
+    end
+
+    # count amount values '1' in vertical vector
+    def count_horizontal(row)
+      horizontal_vector = @puzzle[row][0...@amount_column]
+      count_vector(horizontal_vector)
+    end
+
+    def vertical_acceptable?(row, column)
+      unless row == @amount_row-1
+        vector_acceptable?( @vertical[column], count_vertical(column) )
+      else
+        return  ( @vertical[column] == count_vertical(column) )
+      end
+    end
+
+    def horizontal_acceptable?(row, column)
+      unless column == @amount_column-1
+        vector_acceptable?( @horizontal[row], count_horizontal(row) )
+      else
+        return ( @horizontal[row] == count_horizontal(row))
+      end
+    end
+
+    def vector_acceptable?(origin, piece)
+      return false if piece.length > origin.length
+      piece.each_with_index do |value, index|
+        if index == piece.length-1
+           return false unless origin[index] >= piece[index]
+         else
+           return false unless origin[index] == piece[index]
+         end
+       end
+       return true
+    end
+
+  end
+end

data/lib/nonograms/version.rb

@@ -1,3 +1,3 @@
-class Nonograms
-  VERSION = "0.1.0"
+module Nonograms
+  VERSION = "0.1.1"
 end

data/nonograms.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["raglub.ruby@gmail.com"]
   gem.description   = %q{solve the puzzle game nonograms.}
   gem.summary       = %q{Solve Nonograms.}
-  gem.date          = "2012-07-03"
+  gem.date          = "2012-07-07"
   gem.homepage      = "https://github.com/raglub/nonograms"
 
   gem.files         = `git ls-files`.split($\)

data/spec/nonograms_spec.rb

@@ -5,11 +5,11 @@ describe "Nonograms" do
   before(:each) do
     vertical = [[1], [2, 1], [1], [], [1, 1]]
     horizontal = [[1], [2, 1], [1], [1, 1]]
-    @nonograms = Nonograms.new(vertical, horizontal)
+    @nonograms = Nonograms::Solver.new(vertical, horizontal)
   end
 
   it "should properly solve the nonograms" do
-    @nonograms.solve
-    @nonograms.results.should include("01000"+"01101"+"10000"+"01001")
+    @nonograms.solve.should include("01000"+"01101"+"10000"+"01001")
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nonograms
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
+date: 2012-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -40,6 +40,7 @@ files:
 - README.md
 - Rakefile
 - lib/nonograms.rb
+- lib/nonograms/solver.rb
 - lib/nonograms/version.rb
 - nonograms.gemspec
 - spec/nonograms_spec.rb