nonograms 0.2.2 → 0.2.3

data/lib/nonograms.rb

@@ -19,7 +19,11 @@ class Nonograms
   # solve the nonograms
   def solve
     return @results unless @results.empty?
+
+    run_recursion
+    @logic.matrix.set(0, 0, 1)
     run_recursion
+
     @results
   end
 
@@ -48,6 +52,7 @@ private
     true
   end
 
+  # set next cell of matrix on "value"
   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

data/lib/nonograms/logic.rb

@@ -17,10 +17,12 @@ class Nonograms
       @matrix
     end
 
+    # the vertical and the horizontal vectors have acceptable values
     def cross_acceptable?(row, column)
       vertical_acceptable?(row, column) and horizontal_acceptable?(row, column)
     end
 
+    # the vertical vector have acceptable values
     def vertical_acceptable?(row, column)
       unless row == @amount_row-1
         vector_acceptable?( @vertical[column], @matrix.count_vertical(column) )
@@ -29,6 +31,7 @@ class Nonograms
       end
     end
 
+    # the horizontal vector have acceptable values
     def horizontal_acceptable?(row, column)
       unless column == @amount_column-1
         vector_acceptable?( @horizontal[row], @matrix.count_horizontal(row) )
@@ -37,6 +40,13 @@ class Nonograms
       end
     end
 
+    # the vector have acceptable values
+    # * origin - vector base
+    # * piece - vector to verifi
+    # * return - true or false
+    # example:
+    # origin = [3, 2, 2]; piece = [3, 1]; return true
+    # origin = [3, 2, 2]; piece = [3, 3]; return false
     def vector_acceptable?(origin, piece)
       return false if piece.length > origin.length
       piece.each_with_index do |value, index|

data/lib/nonograms/matrix.rb

@@ -50,11 +50,7 @@ class Nonograms
 
     # get the matrix with cells values zero
     def create_matrix
-      result = []
-      @height.times do |index|
-        result << [0]*@width
-      end
-      result
+      (0...@height).to_a.map {|element| [0]*@width}
     end
   end
 end

data/lib/nonograms/version.rb

@@ -1,3 +1,3 @@
 class Nonograms
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 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-10"
+  gem.date          = "2012-07-13"
   gem.homepage      = "https://github.com/raglub/nonograms"
 
   gem.files         = `git ls-files`.split($\)

data/spec/nonograms_spec.rb

@@ -2,17 +2,32 @@ require 'nonograms'
 
 describe Nonograms do
 
-  before(:each) do
-    vertical = [[1], [2, 1], [1], [], [1, 1]]
-    horizontal = [[1], [2, 1], [1], [1, 1]]
-    @nonograms = Nonograms.new(horizontal, vertical)
-  end
+  context "when first cell is zero" do
+    before(:each) do
+      vertical = [[1], [2, 1], [1], [], [1, 1]]
+      horizontal = [[1], [2, 1], [1], [1, 1]]
+      @nonograms = Nonograms.new(horizontal, vertical)
+    end
+
+    it "should properly solve the nonograms" do
+      @nonograms.solve.should include("01000"+"01101"+"10000"+"01001")
+    end
 
-  it "should properly solve the nonograms" do
-    @nonograms.solve.should include("01000"+"01101"+"10000"+"01001")
+    it "should properly entered data" do
+      @nonograms.properly_data_entered?.should be_true
+    end
   end
 
-  it "should properly entered data" do
-    @nonograms.properly_data_entered?.should be_true
+  context "when first cell is one" do
+
+    before(:each) do
+      vertical = [[3], [1], [2], [1, 1], [1, 1], [1]]
+      horizontal = [[1, 3], [1], [5], [1]]
+      @nonograms = Nonograms.new(horizontal, vertical)
+    end
+
+    it "should properly solve the nonograms" do
+      @nonograms.solve.should include("100111" + "100000" + "111110" +  "001000")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nonograms
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec