nonograms 0.2.0 → 0.2.1

data/README.md

@@ -18,7 +18,7 @@ Or install it yourself as:
 
 ## Usage
 
-    For example:
+For example:
 
               2           1
           1   1   1       1
@@ -57,6 +57,9 @@ You can solve this example when you write the code below
     > @nonograms = Nonograms.new(horizontal, vertical)
     > @nonograms.solve #=> ["01000"+"01101"+"10000"+"01001", ...]
 
+Check whether entered data are properly
+
+    > @nonograms.properly_data_entered? #=> true
 
 Display result on the console
 

data/lib/nonograms.rb

@@ -2,8 +2,9 @@
 require "nonograms/version"
 require "nonograms/display"
 require "nonograms/checker"
+require "nonograms/matrix"
 
-# class can solve the puzzle game Nonograms
+# class can solve the matrix game Nonograms
 class Nonograms
 
   def initialize(horizontal, vertical)
@@ -11,7 +12,7 @@ class Nonograms
     @horizontal = horizontal
     @amount_row = horizontal.length
     @amount_column = vertical.length
-    @puzzle = empty_puzzle
+    @matrix = Nonograms::Matrix.new(@amount_row, @amount_column)
     @results = []
   end
 
@@ -27,39 +28,23 @@ class Nonograms
     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)
+  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], count_vertical(column) )
+      vector_acceptable?( @vertical[column], @matrix.count_vertical(column) )
     else
-      return  ( @vertical[column] == count_vertical(column) )
+      return  ( @vertical[column] == @matrix.count_vertical(column) )
     end
   end
 
   def horizontal_acceptable?(row, column)
     unless column == @amount_column-1
-      vector_acceptable?( @horizontal[row], count_horizontal(row) )
+      vector_acceptable?( @horizontal[row], @matrix.count_horizontal(row) )
     else
-      return ( @horizontal[row] == count_horizontal(row))
+      return ( @horizontal[row] == @matrix.count_horizontal(row))
     end
   end
 
@@ -75,22 +60,13 @@ class Nonograms
     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
+  # 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(@puzzle)).flatten.join("")
+      @results << Marshal.load(Marshal.dump(@matrix.get)).flatten.join("")
       return nil
     end
     next_cell_set(0, row, column)
@@ -100,9 +76,9 @@ 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
+    @matrix.set(new_row, new_column, value)
     run_recursion(new_row, new_column)
-    @puzzle[new_row][new_column] = 0
+    @matrix.set(new_row, new_column, 0)
   end
 
 end

data/lib/nonograms/display.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 class Nonograms
+
   class Display
 
     def initialize(results, amount_row, amount_column)

data/lib/nonograms/matrix.rb

@@ -0,0 +1,60 @@
+# encoding: utf-8
+
+class Nonograms
+
+  class Matrix
+
+    def initialize(height, width)
+      @height = height
+      @width = width
+      @matrix = create_matrix
+    end
+
+    # set cell of position row and column some value
+    def set(row, column, value)
+      @matrix[row][column] = value
+    end
+
+    # get the matrix
+    def get
+      @matrix
+    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
+
+    # get vector from index of column
+    def vertical_vector(index)
+      @matrix[0...@height].map{|vector| vector[index]}
+    end
+
+    # count amount values '1' in vertical vector
+    def count_vertical(column)
+      count_vector(vertical_vector(column))
+    end
+
+    # get vector from index of row
+    def horizontal_vector(index)
+      @matrix[index][0...@width]
+    end
+
+    # count amount values '1' in horizontal vector
+    def count_horizontal(row)
+      count_vector(horizontal_vector(row))
+    end
+
+    # get the matrix with cells values zero
+    def create_matrix
+      result = []
+      @height.times do |index|
+        result << [0]*@width
+      end
+      result
+    end
+  end
+end

data/lib/nonograms/version.rb

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

data/spec/matrix_spec.rb

@@ -0,0 +1,25 @@
+require 'nonograms'
+
+describe Nonograms::Matrix do
+
+  before(:each) do
+    @matrix = Nonograms::Matrix.new(5, 6)
+  end
+
+  it "should properly count amount of numbers 1 in vector" do
+    vector = [0, 0, 1, 1, 1, 0, 1]
+    @matrix.count_vector(vector).should eql([3, 1])
+  end
+
+  it "should properly count amount of numbers 1 in vertical vector" do
+    @matrix.set(0, 2, 1)
+    @matrix.set(4, 2, 1)
+    @matrix.count_vertical(2).should eql([1, 1])
+  end
+
+  it "should properly count amount of numbers 1 in horizontal vector" do
+    @matrix.set(2, 1, 1)
+    @matrix.set(2, 5, 1)
+    @matrix.count_horizontal(2).should eql([1, 1])
+  end
+end

data/spec/nonograms_spec.rb

@@ -1,6 +1,6 @@
 require 'nonograms'
 
-describe "Nonograms" do
+describe Nonograms do
 
   before(:each) do
     vertical = [[1], [2, 1], [1], [], [1, 1]]
@@ -12,9 +12,8 @@ describe "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])
+  it "should properly entered data" do
+    @nonograms.properly_data_entered?.should be_true
   end
 
   it "for vectors acceptable" do
@@ -31,4 +30,5 @@ describe "Nonograms" do
     @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.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-07 00:00:00.000000000 Z
+date: 2012-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -42,9 +42,11 @@ files:
 - lib/nonograms.rb
 - lib/nonograms/checker.rb
 - lib/nonograms/display.rb
+- lib/nonograms/matrix.rb
 - lib/nonograms/version.rb
 - nonograms.gemspec
 - spec/checker_spec.rb
+- spec/matrix_spec.rb
 - spec/nonograms_spec.rb
 homepage: https://github.com/raglub/nonograms
 licenses: []
@@ -72,4 +74,5 @@ specification_version: 3
 summary: Solve Nonograms.
 test_files:
 - spec/checker_spec.rb
+- spec/matrix_spec.rb
 - spec/nonograms_spec.rb