lib/sudoku_solver/grid.rb in sudoku-jedi-1.0.0 vs lib/sudoku_solver/grid.rb in sudoku-jedi-1.0.1

@@ -1,6 +1,5 @@
-require_relative 'box'
 require_relative 'point'
 require 'set'
 
 class Grid
   attr_accessor  :remaining_nums, :points
@@ -10,11 +9,11 @@
       text.split("").map(&:to_i).each_with_index do |num, col|
         @points << Point.new(row, col, num)
       end
     end
     
-    @points.select { |po| po.value == 0 }.each do |poi|
+    remaining_points.each do |poi|
       poi.nums = Array(1..9) - (get_box(poi.box) + get_row(poi.y) + get_column(poi.x))
     end
   end
 
   def print_values_formatted
@@ -189,12 +188,10 @@
   end
 
 
   def hidden_pairs
     all_naked_pairs
-#   @points.select { |p| p.x == 6  &&  p.y == 4  }.first.nums =  @points.select { |p| p.x == 6  &&  p.y == 4  }.first.nums - [1,5]
-#   @points.select { |p| p.x == 6  &&  p.y == 6  }.first.nums =  @points.select { |p| p.x == 6  &&  p.y == 6  }.first.nums - [3,6]
     
     remaining_points.each do |point|
       next if point.nums.count <= 1
       point.nums.combination(2).each do |arr|
         components.each do |symbol|
@@ -217,15 +214,20 @@
     remaining_points.each do |point|
       point.nums.each do |num|
         [:x, :y].each do |symbol|
           arr = @points.select{ |p| p.nums.include?(num) && p.send(flip(symbol)) == point.send(flip(symbol)) && p.value == 0  }
           if arr.count == 2 && @points.select { |p| p.value == num && p.send(flip(symbol)) == point.send(flip(symbol)) }.count == 0
-            last = @points.select { |p| p.nums.include?(num) && arr.map{ |a| a.send(symbol) }.include?(p.send(symbol)) && (!arr.include?(p)) && p.value == 0 && check_row(p.y,p,num,symbol) }
-            if last.all? { |x| x.send(flip(symbol)) == last.first.send(flip(symbol)) } && last.count == 2 && @points.select { |p| p.value == num && p.send(flip(symbol)) == last.first.send(flip(symbol)) }.count == 0
-              final = arr + last 
-              places = final.map { |m| m.send(symbol) }.uniq
-              remaining_points.select { |p| places.include?(p.send(symbol)) && (!final.include?(p)) }.each do |poi|
-                poi.nums = poi.nums - [num]
+            last = @points.select { |p| p.nums.include?(num) &&
+                                    arr.map{ |a| a.send(symbol) }.include?(p.send(symbol)) &&
+                                    (!arr.include?(p)) &&
+                                    p.value == 0 && check_row(p.y,p,num,symbol) }
+            if last.all? { |x| x.send(flip(symbol)) == last.first.send(flip(symbol)) } &&
+               last.count == 2 && 
+               @points.select { |p| p.value == num && p.send(flip(symbol)) == last.first.send(flip(symbol)) }.count == 0
+                 final = arr + last 
+                 places = final.map { |m| m.send(symbol) }.uniq
+                 remaining_points.select { |p| places.include?(p.send(symbol)) && (!final.include?(p)) }.each do |poi|
+                 poi.nums = poi.nums - [num]
               end
             end
           end
         end
       end