nonograms 0.2.1 → 0.2.2

data/README.md

@@ -27,9 +27,9 @@ For example:
         +---+---+---+---+---+
     2 1 |   |   |   |   |   |
         +---+---+---+---+---+
-    2 1 |   |   |   |   |   |
+      1 |   |   |   |   |   |
         +---+---+---+---+---+
-    2 1 |   |   |   |   |   |
+    1 1 |   |   |   |   |   |
         +---+---+---+---+---+
 
 We should get result
@@ -41,9 +41,9 @@ We should get result
         +---+---+---+---+---+
     2 1 |   | # | # |   | # |
         +---+---+---+---+---+
-    2 1 | # |   |   |   |   |
+      1 | # |   |   |   |   |
         +---+---+---+---+---+
-    2 1 |   | # |   |   | # |
+    1 1 |   | # |   |   | # |
         +---+---+---+---+---+
 
 in line result should be "01000"+"01101"+"10000"+"01001"
@@ -64,17 +64,21 @@ Check whether entered data are properly
 Display result on the console
 
     > @nonograms.display
+
     #=> result: 0
-    #=>
-    #=>   ■
-    #=>   ■ ■   ■
-    #=> ■
-    #=>   ■     ■
-    #=>
-    #=> result: 1
-    #=>
-    #=>   ■
-    #=> ■ ■     ■
-    #=>     ■
-    #=>   ■     ■
+    #=>      1 2 1   1
+    #=>        1     1
+    #=>      ----------
+    #=> 1   |  ■
+    #=> 2 1 |  ■ ■   ■
+    #=> 1   |■
+    #=> 1 1 |  ■     ■
 
+    #=> result: 1
+    #=>      1 2 1   1
+    #=>        1     1
+    #=>      ----------
+    #=> 1   |  ■
+    #=> 2 1 |■ ■     ■
+    #=> 1   |    ■
+    #=> 1 1 |  ■     ■

data/lib/nonograms.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 require "nonograms/version"
+require "nonograms/logic"
 require "nonograms/display"
 require "nonograms/checker"
-require "nonograms/matrix"
 
 # class can solve the matrix game Nonograms
 class Nonograms
@@ -12,7 +12,7 @@ class Nonograms
     @horizontal = horizontal
     @amount_row = horizontal.length
     @amount_column = vertical.length
-    @matrix = Nonograms::Matrix.new(@amount_row, @amount_column)
+    @logic = Nonograms::Logic.new(@horizontal, @vertical)
     @results = []
   end
 
@@ -25,60 +25,36 @@ class Nonograms
 
   # display the result on console
   def display
-    Nonograms::Display.new(@results, @amount_row, @amount_column)
+    Nonograms::Display.new(@results, @horizontal, @vertical)
   end
 
   def properly_data_entered?
     Nonograms::Checker.new(@vertical, @horizontal).properly_data_entered?
   end
 
-  def vertical_acceptable?(row, column)
-    unless row == @amount_row-1
-      vector_acceptable?( @vertical[column], @matrix.count_vertical(column) )
-    else
-      return  ( @vertical[column] == @matrix.count_vertical(column) )
-    end
-  end
-
-  def horizontal_acceptable?(row, column)
-    unless column == @amount_column-1
-      vector_acceptable?( @horizontal[row], @matrix.count_horizontal(row) )
-    else
-      return ( @horizontal[row] == @matrix.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
-
 private
 
   # run recursion from fixed position row and column if @matrix 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(@matrix.get)).flatten.join("")
-      return nil
-    end
+    return unless @logic.cross_acceptable?(row, column)
+    return if last_cell?(row, column)
     next_cell_set(0, row, column)
     next_cell_set(1, row, column)
   end
 
+  def last_cell?(row, column)
+    return false unless row == @amount_row-1 and column == @amount_column-1
+    @results << Marshal.load(Marshal.dump(@logic.matrix.get)).flatten.join("")
+    true
+  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
-    @matrix.set(new_row, new_column, value)
+
+    @logic.matrix.set(new_row, new_column, value)
     run_recursion(new_row, new_column)
-    @matrix.set(new_row, new_column, 0)
+    @logic.matrix.set(new_row, new_column, 0)
   end
 
 end

data/lib/nonograms/display.rb

@@ -2,12 +2,15 @@
 
 class Nonograms
 
+  #Display result on the console
   class Display
 
-    def initialize(results, amount_row, amount_column)
+    def initialize(results, horizontal, vertical)
       @results = results
-      @amount_row = amount_row
-      @amount_column = amount_column
+      @horizontal = horizontal
+      @vertical = vertical
+      @amount_row = horizontal.length
+      @amount_column = vertical.length
       show_results(results)
     end
 
@@ -18,13 +21,46 @@ class Nonograms
       end
     end
 
+    def max_length(array)
+      array.inject(0) { |result, value| result = value.length if value.length > result; result}
+    end
+
     def show_result(result)
+      print_header
       result.split("").each_with_index do |value, index|
-        print "\n" if index % @amount_column == 0
+        if index % @amount_column == 0
+          print "\n"
+          print_margin(index/@amount_column)
+        end
         print "■ " if value == "1"
         print "  " if value == "0"
       end
       print "\n\n"
     end
+
+    def print_header
+      max_length(@vertical).times.each do |index|
+        print_margin(-1)
+        @vertical.each do |element|
+          print element[index] || " "
+          print " "
+        end
+        print "\n"
+      end
+      print_margin(-1)
+      @vertical.length.times.each { |index| print "--" }
+    end
+
+    def print_margin(index)
+      if index == -1
+        print "  "*max_length(@horizontal) + " "
+      else
+        max_length(@horizontal).times do |sub_index|
+          print @horizontal[index][sub_index] || " "
+          print " "
+        end
+        print "|"
+      end
+    end
   end
 end

data/lib/nonograms/logic.rb

@@ -0,0 +1,53 @@
+# encoding: utf-8
+require 'nonograms/matrix'
+
+class Nonograms
+
+  class Logic
+
+    def initialize(horizontal, vertical)
+      @vertical = vertical
+      @horizontal = horizontal
+      @amount_row = horizontal.length
+      @amount_column = vertical.length
+      @matrix = Nonograms::Matrix.new(@amount_row, @amount_column)
+    end
+
+    def matrix
+      @matrix
+    end
+
+    def cross_acceptable?(row, column)
+      vertical_acceptable?(row, column) and horizontal_acceptable?(row, column)
+    end
+
+    def vertical_acceptable?(row, column)
+      unless row == @amount_row-1
+        vector_acceptable?( @vertical[column], @matrix.count_vertical(column) )
+      else
+        return  ( @vertical[column] == @matrix.count_vertical(column) )
+      end
+    end
+
+    def horizontal_acceptable?(row, column)
+      unless column == @amount_column-1
+        vector_acceptable?( @horizontal[row], @matrix.count_horizontal(row) )
+      else
+        return ( @horizontal[row] == @matrix.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.2.1"
+  VERSION = "0.2.2"
 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-08"
+  gem.date          = "2012-07-10"
   gem.homepage      = "https://github.com/raglub/nonograms"
 
   gem.files         = `git ls-files`.split($\)

data/spec/logic_spec.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+require 'nonograms'
+
+describe Nonograms::Logic do
+
+  before(:each) do
+    vertical = [[1], [2, 1], [1], [], [1, 1]]
+    horizontal = [[1], [2, 1], [1], [1, 1]]
+    @logic = Nonograms::Logic.new(horizontal, vertical)
+  end
+
+  it "for vectors acceptable" do
+    origin = [3, 1, 2]
+    @logic.vector_acceptable?(origin, [3, 1]).should be_true
+    @logic.vector_acceptable?(origin, [3, 1, 2]).should be_true
+    @logic.vector_acceptable?(origin, [3, 1, 1]).should be_true
+    @logic.vector_acceptable?(origin, []).should be_true
+  end
+
+  it "for vectors don't acceptable" do
+    origin = [3, 1, 2]
+    @logic.vector_acceptable?(origin, [4, 1]).should be_false
+    @logic.vector_acceptable?(origin, [3, 1, 2, 4]).should be_false
+    @logic.vector_acceptable?(origin, [3, 1, 3]).should be_false
+  end
+
+end

data/spec/nonograms_spec.rb

@@ -15,20 +15,4 @@ describe Nonograms do
   it "should properly entered data" do
     @nonograms.properly_data_entered?.should be_true
   end
-
-  it "for vectors acceptable" do
-    origin = [3, 1, 2]
-    @nonograms.vector_acceptable?(origin, [3, 1]).should be_true
-    @nonograms.vector_acceptable?(origin, [3, 1, 2]).should be_true
-    @nonograms.vector_acceptable?(origin, [3, 1, 1]).should be_true
-    @nonograms.vector_acceptable?(origin, []).should be_true
-  end
-
-  it "for vectors don't acceptable" do
-    origin = [3, 1, 2]
-    @nonograms.vector_acceptable?(origin, [4, 1]).should be_false
-    @nonograms.vector_acceptable?(origin, [3, 1, 2, 4]).should be_false
-    @nonograms.vector_acceptable?(origin, [3, 1, 3]).should be_false
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nonograms
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-08 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -42,10 +42,12 @@ files:
 - lib/nonograms.rb
 - lib/nonograms/checker.rb
 - lib/nonograms/display.rb
+- lib/nonograms/logic.rb
 - lib/nonograms/matrix.rb
 - lib/nonograms/version.rb
 - nonograms.gemspec
 - spec/checker_spec.rb
+- spec/logic_spec.rb
 - spec/matrix_spec.rb
 - spec/nonograms_spec.rb
 homepage: https://github.com/raglub/nonograms
@@ -74,5 +76,6 @@ specification_version: 3
 summary: Solve Nonograms.
 test_files:
 - spec/checker_spec.rb
+- spec/logic_spec.rb
 - spec/matrix_spec.rb
 - spec/nonograms_spec.rb