namero 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d21908e8458c2569f1584e9e3f8b55ffd5907abb713ede832d1432d2ffd6df2
-  data.tar.gz: 11d343b7e82c3bc8f679e8f60bf0eaed1986ea045b8681791da495b2d15bc459
+  metadata.gz: 027c27f9e7b9a2f8e9662c961c907c4cd38c1c4f6d5461bbd4ad03673604b605
+  data.tar.gz: 31fe4354d07c60114a714bc33a36f3800984d76ec66f78566d2bebd3d8b80dc0
 SHA512:
-  metadata.gz: 6c6353da77e5906617a5fdbe110490ec4006d1cb1ab1bd171f6ff5ab06a9ddd2d2cfbc4d21dab3c7a1000b5336c0f11512bbb6da4ed68f4be225e9f37ceb803b
-  data.tar.gz: 64caf28995793c5a853d90f4a4ade297a761fc5b3ce10813ae3d1b215fe11e30b6e403b9cb02c93689cc9a09eb6d16cbe0ce1d9142841c37e5053c1522d3bf11
+  metadata.gz: 478c5e53b2d38163b353cf97ae127bdc70699dc00f3010c7be1dfcb07f70479fed3ef8d0bd468c7c1d2e1ebcc772e4cd0bed853bcfd01876c10958b4a9ff228a
+  data.tar.gz: 2846d3036c4be2449d30d39c0ecc2a206dea9a67ee3483a8457950b8bbdb1b65958d8fce579061bd38c776f6ef5dc7b0a05dacf8ea37249b9a3ad5347bb2a64e

data/lib/namero.rb

@@ -1,6 +1,7 @@
 require "namero/version"
 require 'namero/board'
 require 'namero/solver'
+require 'namero/solver_extensions'
 require 'namero/value'
 
 module Namero

data/lib/namero/board.rb

@@ -2,46 +2,60 @@ module Namero
   class Board
     attr_reader :n
 
+    # ..4.
+    # ...1
+    # 4...
+    # 21..
+    def self.load_from_string(str, n)
+      values = str.split("\n").map(&:chars).flatten.map.with_index do |v, idx|
+        if v == '.'
+          Namero::Value.new(value: nil, candidates: (1..n).to_a, index: idx)
+        else
+          Namero::Value.new(value: Integer(v), candidates: [Integer(v)], index: idx)
+        end
+      end
+      Namero::Board.new(n: n, values: values)
+    end
+
+    # [
+    #   nil, nil,   4, nil,
+    #   nil, nil, nil, 1,
+    #   4,   nil, nil, nil,
+    #   2,   1,   nil, nil,
+    # ]
+    def self.load_from_array(array, n)
+      values = array.map.with_index do |v, idx|
+        if v
+          Namero::Value.new(value: v, candidates: [v], index: idx)
+        else
+          Namero::Value.new(value: nil, candidates: (1..n).to_a, index: idx)
+        end
+      end
+      Namero::Board.new(n: n, values: values)
+    end
+
     # n: Integer
     # values: Array<Integer>
     def initialize(n:, values: Array.new(n**2))
       raise ArgumentError if values.size != n**2
       @n = n
       @values = values
-    end
-
-    # x, y: 0 based index
-    # type: :single, :row, :column, :block, :index
-    def []=(idx, type = :index, value)
-      case type
-      when :index
-        @values[idx] = value
-      when :row
-        start = (idx / n) * n
-        n.times do |i|
-          @values[start+i] = value[i]
-        end
-      when :column
-        x = idx % n
-        n.times do |i|
-          @values[i * n + x] = value[i]
-        end
-      when :block
-        x = idx % n
-        y = idx / n
-        start_x = x / root_n * root_n
-        start_y = y / root_n * root_n
-
-        value_idx = 0
+      @rows = Array.new(n) do |i|
+        start = i * n
+        values[start...start+n]
+      end
+      @columns = Array.new(n) do |x|
+        Array.new(n) { |i| values[i * n + x] }
+      end
+      @blocks = Array.new(n) do |i|
+        idx = i % root_n * root_n + (i / root_n) * n * root_n
+        block = []
         root_n.times do |y_offset|
           root_n.times do |x_offset|
-
-            self[start_x + x_offset + (start_y + y_offset) * n] = value[value_idx]
-            value_idx += 1
+            block << values[idx + x_offset + y_offset * n]
           end
         end
-      else
-        raise "Unknown type: #{type}"
+        block
       end
     end
 
@@ -50,25 +64,12 @@ module Namero
       when :index
         @values[idx]
       when :row
-        start = (idx / n ) * n
-        @values[start...start+@n]
+        @rows[idx / n]
       when :column
         x = idx % n
-        @values.each_slice(n).map{|row| row[x]}
+        @columns[x]
       when :block
-        x = idx % n
-        y = idx / n
-        start_x = x / root_n * root_n
-        start_y = y / root_n * root_n
-
-        [].tap do |res|
-          root_n.times do |y_offset|
-            root_n.times do |x_offset|
-              
-              res << self[start_x + x_offset + (start_y + y_offset) * n]
-            end
-          end
-        end
+        @blocks[idx / n / root_n * root_n + idx % n / root_n]
       else
         raise "Unknown type: #{type}"
       end
@@ -86,15 +87,89 @@ module Namero
       end
     end
 
+    def each_affected_group(&block)
+      return enum_for(__method__) unless block_given?
+
+      @rows.each(&block)
+      @columns.each(&block)
+      @blocks.each(&block)
+    end
+
     def complete?
-      @values.all? do |v|
+      all_filled = @values.all? do |v|
         v.value
       end
+      return false unless all_filled
+
+      return each_affected_group.all? do |group|
+        group.map(&:value).uniq.size == n
+      end
     end
 
-    private
+    def to_s(mode: :simple)
+      out = +""
+      case mode
+      when :simple
+        @values.each.with_index do |v, idx|
+          if v.value
+            out << (v.value).to_s
+          else
+            out << '.'
+          end
+          out << "\n" if idx % n == n - 1
+        end
+      when :with_candidates
+        @values.each.each_slice(n).with_index do |values, index|
+          values.each_slice(root_n) do |values2|
+            values2.each do |v|
+              if v.value
+                out << '***'
+              else
+                out << (v.candidates.include?(1) ? '1' : '.')
+                out << (v.candidates.include?(2) ? '2' : '.')
+                out << (v.candidates.include?(3) ? '3' : '.')
+              end
+              out << ' '
+            end
+            out << ' | '
+          end
+          out << "\n"
+          values.each_slice(root_n) do |values2|
+            values2.each do |v|
+              if v.value
+                out << "*#{v.value}*"
+              else
+                out << (v.candidates.include?(4) ? '4' : '.')
+                out << (v.candidates.include?(5) ? '5' : '.')
+                out << (v.candidates.include?(6) ? '6' : '.')
+              end
+              out << ' '
+            end
+            out << ' | '
+          end
+          out << "\n"
+          values.each_slice(root_n) do |values2|
+            values2.each do |v|
+              if v.value
+                out << '***'
+              else
+                out << (v.candidates.include?(7) ? '7' : '.')
+                out << (v.candidates.include?(8) ? '8' : '.')
+                out << (v.candidates.include?(9) ? '9' : '.')
+              end
+              out << ' '
+            end
+            out << ' | '
+          end
+          out << "\n#{'-' * ((root_n + 1) * n + (root_n) * 3) if index % root_n == root_n - 1}\n"
+        end
+      else
+        raise "unknown mode: #{mode}"
+      end
+      out
+    end
 
-    def root_n
+    private def root_n
       Integer.sqrt(n)
     end
   end

data/lib/namero/solver.rb

@@ -2,25 +2,28 @@ require 'set'
 
 module Namero
   class Solver
-    def initialize(board)
+    def initialize(board, extensions: [])
       @board = board
       @updated_candidate_queue = Set.new
+      @extensions = extensions
     end
 
     def solve
       fill_candidates
       loop do
-        idx = @updated_candidate_queue.each.first
-        break unless idx
+        idx = updated_candidate_queue.first
+        unless idx
+          extensions.each do |ex|
+            ex.solve(board, updated_candidate_queue)
+          end
+          break if updated_candidate_queue.empty?
+          next
+        end
         @updated_candidate_queue.delete idx
         fill_one_candidate(idx)
       end
     end
 
-    private
-
-    attr_reader :board, :updated_candidate_queue
-
     def fill_one_candidate(idx)
       v = board[idx]
       return if v.candidates.size != 1
@@ -28,23 +31,27 @@ module Namero
       fill_candidate_for(v)
     end
 
+    private
+
+    attr_reader :board, :updated_candidate_queue, :extensions
+
     def fill_candidate_for(v)
       board[v.index, :row].each do |v2|
         unless v2.value
-          v2.candidates -= [v.value]
-          updated_candidate_queue << v2.index
+          changed = v2.candidates.delete(v.value)
+          updated_candidate_queue << v2.index if changed
         end
       end
       board[v.index, :column].each do |v2|
         unless v2.value
-          v2.candidates -= [v.value]
-          updated_candidate_queue << v2.index
+          changed = v2.candidates.delete(v.value)
+          updated_candidate_queue << v2.index if changed
         end
       end
       board[v.index, :block].each do |v2|
         unless v2.value
-          v2.candidates -= [v.value]
-          updated_candidate_queue << v2.index
+          changed = v2.candidates.delete(v.value)
+          updated_candidate_queue << v2.index if changed
         end
       end
       v.candidates = [v.value]

data/lib/namero/solver_extensions.rb

@@ -0,0 +1,50 @@
+module Namero
+  module SolverExtensions
+    # If a candidate number exists only one place in an affected group,
+    # we can fill the box.
+    # For example:
+    #   When candidates are: [1 2 3] [2 3] [1 2 3] [1 2 3 4]
+    #   The last box's value is 4 because there is 4 candidate only the last box.
+    class CandidateExistsOnlyOnePlace
+      def self.solve(board, queue)
+        self.new(board, queue).solve
+      end
+
+      def initialize(board, queue)
+        @board = board
+        @queue = queue
+      end
+
+      def solve
+        board.each_affected_group do |group|
+          table = []
+          group.each do |value|
+            next if value.value
+            value.candidates.each do |c|
+              if table[c].nil?
+                table[c] = value
+              elsif table[c]
+                table[c] = false
+              end
+            end
+          end
+
+          table.each.with_index do |value, idx|
+            if value
+              value.candidates = [idx]
+              queue << value.index
+            end
+          end
+        end
+      end
+
+      private
+
+      attr_reader :board, :queue
+
+      def n
+        board.n
+      end
+    end
+  end
+end

data/lib/namero/value.rb

@@ -10,7 +10,7 @@ module Namero
     end
 
     def dup
-      self.new(value: value, candidates: candidates.dup)
+      self.class.new(value: value, candidates: candidates.dup, index: index)
     end
   end
 end

data/lib/namero/version.rb

@@ -1,3 +1,3 @@
 module Namero
-  VERSION = "0.0.1"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: namero
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Masataka Pocke Kuwabara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-17 00:00:00.000000000 Z
+date: 2020-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,6 +68,7 @@ files:
 - lib/namero.rb
 - lib/namero/board.rb
 - lib/namero/solver.rb
+- lib/namero/solver_extensions.rb
 - lib/namero/value.rb
 - lib/namero/version.rb
 - namero.gemspec
@@ -89,8 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.0.pre1
 signing_key: 
 specification_version: 4
 summary: ''