namero 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d21908e8458c2569f1584e9e3f8b55ffd5907abb713ede832d1432d2ffd6df2
-  data.tar.gz: 11d343b7e82c3bc8f679e8f60bf0eaed1986ea045b8681791da495b2d15bc459
+  metadata.gz: a16aa7fdc8f9a4b1eb651be7507bb91b42abb79e339f5ce0a2fa56481b8d83c4
+  data.tar.gz: c44cf9c0c379494ec46ebc4458ebce94590731eeee179051176c70db3cbbeb49
 SHA512:
-  metadata.gz: 6c6353da77e5906617a5fdbe110490ec4006d1cb1ab1bd171f6ff5ab06a9ddd2d2cfbc4d21dab3c7a1000b5336c0f11512bbb6da4ed68f4be225e9f37ceb803b
-  data.tar.gz: 64caf28995793c5a853d90f4a4ade297a761fc5b3ce10813ae3d1b215fe11e30b6e403b9cb02c93689cc9a09eb6d16cbe0ce1d9142841c37e5053c1522d3bf11
+  metadata.gz: 79fdeed7e19beb90ed5d14167e755a4115209e4f9e0b936d2b975c637a1820e80d99526b05dc851433083d6cc99bf7b4accf0c1b3548872206559144f449b5e2
+  data.tar.gz: d1cbba7f9774777b7ddbf1113eaa0cb1925b7769bf9ef65ecd9e392b621b6551b2eb2e212c392837fb5bf9641a2c0c6166c49b81f7ee934bf23d0339db296664

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,6 +2,21 @@ 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
+
     # n: Integer
     # values: Array<Integer>
     def initialize(n:, values: Array.new(n**2))
@@ -86,10 +101,88 @@ module Namero
       end
     end
 
+    def each_affected_group
+      return enum_for(__method__) unless block_given?
+
+      n.times do |i|
+        yield self[i, :column]
+        yield self[i * n, :row]
+        yield self[(i % root_n) * root_n + (i / root_n) * n * root_n, :block]
+      end
+    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
+
+    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
 
     private

data/lib/namero/solver.rb

@@ -2,16 +2,23 @@ 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.each.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
@@ -19,7 +26,7 @@ module Namero
 
     private
 
-    attr_reader :board, :updated_candidate_queue
+    attr_reader :board, :updated_candidate_queue, :extensions
 
     def fill_one_candidate(idx)
       v = board[idx]

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|
+          (1..n).each do |v|
+            box = nil
+            group.each do |value|
+              if value.candidates.include?(v) && value.value.nil?
+                if box
+                  box = nil
+                  break
+                else
+                  box = value
+                end
+              end
+            end
+
+            if box
+              box.candidates = [v]
+              queue << box.index
+            end
+          end
+        end
+      end
+
+      private
+
+      attr_reader :board, :queue
+
+      def n
+        board.n
+      end
+    end
+  end
+end

data/lib/namero/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: namero
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Masataka Pocke Kuwabara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-17 00:00:00.000000000 Z
+date: 2019-07-14 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.0.3
 signing_key: 
 specification_version: 4
 summary: ''