nonograms 0.1.1 → 0.2.0

data/README.md

@@ -54,6 +54,24 @@ 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::Solver.new(vertical, horizontal)
+    > @nonograms = Nonograms.new(horizontal, vertical)
     > @nonograms.solve #=> ["01000"+"01101"+"10000"+"01001", ...]
 
+
+Display result on the console
+
+    > @nonograms.display
+    #=> result: 0
+    #=>
+    #=>   ■
+    #=>   ■ ■   ■
+    #=> ■
+    #=>   ■     ■
+    #=>
+    #=> result: 1
+    #=>
+    #=>   ■
+    #=> ■ ■     ■
+    #=>     ■
+    #=>   ■     ■
+

data/lib/nonograms.rb

@@ -1,3 +1,108 @@
 # encoding: utf-8
 require "nonograms/version"
-require "nonograms/solver"
+require "nonograms/display"
+require "nonograms/checker"
+
+# class can solve the puzzle game Nonograms
+class Nonograms
+
+  def initialize(horizontal, vertical)
+    @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
+
+  # display the result on console
+  def display
+    Nonograms::Display.new(@results, @amount_row, @amount_column)
+  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
+
+  # get the matrix with cells values zero
+  def empty_puzzle
+    result = []
+    @amount_row.times do |index|
+      result << [0]*@amount_column
+    end
+    result
+  end
+
+private
+
+  # 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
+
+end

data/lib/nonograms/checker.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+class Nonograms
+  class Checker
+
+    def initialize(vertical, horizontal)
+      @vertical = vertical
+      @horizontal = horizontal
+    end
+
+    def properly_data_entered?
+      @vertical.flatten.inject(&:+) == @horizontal.flatten.inject(&:+)
+    end
+
+    # TODO
+  end
+end

data/lib/nonograms/display.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+
+class Nonograms
+  class Display
+
+    def initialize(results, amount_row, amount_column)
+      @results = results
+      @amount_row = amount_row
+      @amount_column = amount_column
+      show_results(results)
+    end
+
+    def show_results(results)
+      results.each_with_index do |result, index|
+        puts "result: " + index.to_s
+        show_result(result)
+      end
+    end
+
+    def show_result(result)
+      result.split("").each_with_index do |value, index|
+        print "\n" if index % @amount_column == 0
+        print "■ " if value == "1"
+        print "  " if value == "0"
+      end
+      print "\n\n"
+    end
+  end
+end

data/lib/nonograms/version.rb

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

data/nonograms.gemspec

@@ -2,7 +2,7 @@
 require File.expand_path('../lib/nonograms/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Michał Szyma"]
+  gem.authors       = ["Michal Szyma"]
   gem.email         = ["raglub.ruby@gmail.com"]
   gem.description   = %q{solve the puzzle game nonograms.}
   gem.summary       = %q{Solve Nonograms.}

data/spec/checker_spec.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+require 'nonograms'
+
+describe Nonograms::Checker do
+
+  it "should return true" do
+    vertical = [[2, 1], [1]]
+    horizontal = [[1], [2], [], [1]]
+    Nonograms::Checker.new(vertical, horizontal).properly_data_entered?.should be_true
+  end
+
+  it "should return false" do
+    vertical = [[2, 1], [1]]
+    horizontal = [[1], [3], [], [1]]
+    Nonograms::Checker.new(vertical, horizontal).properly_data_entered?.should be_false
+  end
+
+end

data/spec/nonograms_spec.rb

@@ -5,11 +5,30 @@ describe "Nonograms" do
   before(:each) do
     vertical = [[1], [2, 1], [1], [], [1, 1]]
     horizontal = [[1], [2, 1], [1], [1, 1]]
-    @nonograms = Nonograms::Solver.new(vertical, horizontal)
+    @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 count amount of numbers 1 in vector" do
+    vector = [0, 0, 1, 1, 1, 0, 1]
+    @nonograms.count_vector(vector).should eql([3, 1])
+  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,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: nonograms
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
-- Michał Szyma
+- Michal Szyma
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -40,9 +40,11 @@ files:
 - README.md
 - Rakefile
 - lib/nonograms.rb
-- lib/nonograms/solver.rb
+- lib/nonograms/checker.rb
+- lib/nonograms/display.rb
 - lib/nonograms/version.rb
 - nonograms.gemspec
+- spec/checker_spec.rb
 - spec/nonograms_spec.rb
 homepage: https://github.com/raglub/nonograms
 licenses: []
@@ -69,4 +71,5 @@ signing_key:
 specification_version: 3
 summary: Solve Nonograms.
 test_files:
+- spec/checker_spec.rb
 - spec/nonograms_spec.rb

data/lib/nonograms/solver.rb

@@ -1,104 +0,0 @@
-# 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