namero 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d873a422ed56c6cd9838805394b1c2fb1ae7ad33f6eb65fb2338880f598fb427
-  data.tar.gz: b71ec4d6319f4267142997c99a3f4ac85d987ef9e5526d837b31544c93eee75d
+  metadata.gz: 4ec3f119c8411016246a15c40422b349db2b79eda32597a34ed3bca564821311
+  data.tar.gz: f2e5c017ca3b45fa298607d83d5cc70b270bc139cda30ecb540c9f0fc8bf760d
 SHA512:
-  metadata.gz: 71ee42cdf9509fd8daf2699a37f9979ee83ae4f70dbeaaed762f0c2eb1ee740bd8a901fe49699579183712e9485a7580205b3334823154d0e72dd896aad669e0
-  data.tar.gz: 840f26d770194bb6d32e2243fe61f18d39bccd537fe1cc144e1935ac2ba804ca78d887b62e1c31c2603f45f01b2cbd199e5b9eaeb00fe00758a6ffe96ecd2ad6
+  metadata.gz: cca575989a770f0383c3fc62e3f95e3f663465b0a776f266110bfbd950f4142eae14dc4060c9d8431145597aeec5f64347f5d5cb19e1825820af9b899b33b914
+  data.tar.gz: 585ee296abb31a139033b7d4a062b4508d032f9039d376a3f18bb5e1b30613bedfb3b1d564d03190ec17157a962a37c1e23e49e964f75719291f22d57d02ec40

data/lib/namero/board.rb

@@ -23,40 +23,22 @@ module Namero
       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
 
@@ -65,25 +47,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
-        Array.new(n) { |i| @values[i * n + 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
@@ -101,14 +70,12 @@ module Namero
       end
     end
 
-    def each_affected_group
+    def each_affected_group(&block)
       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
+      @rows.each(&block)
+      @columns.each(&block)
+      @blocks.each(&block)
     end
 
     def complete?
@@ -185,9 +152,7 @@ module Namero
       out
     end
 
-    private
-
-    def root_n
+    private def root_n
       Integer.sqrt(n)
     end
   end

data/lib/namero/solver.rb

@@ -38,20 +38,20 @@ module Namero
     def fill_candidate_for(v)
       board[v.index, :row].each do |v2|
         unless v2.value
-          v2.candidates.delete(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.delete(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.delete(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

@@ -17,22 +17,22 @@ module Namero
 
       def solve
         board.each_affected_group do |group|
-          (1..n).each do |v|
-            box = nil
-            group.each do |value|
-              if !value.value && value.candidates.include?(v)
-                if box
-                  box = nil
-                  break
-                else
-                  box = value
-                end
+          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
 
-            if box
-              box.candidates = [v]
-              queue << box.index
+          table.each.with_index do |value, idx|
+            if value
+              value.candidates = [idx]
+              queue << value.index
             end
           end
         end

data/lib/namero/version.rb

@@ -1,3 +1,3 @@
 module Namero
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: namero
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Masataka Pocke Kuwabara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler