binary_puzzle_solver 0.0.4 → 0.0.5

data/bin/binary-puzzle-solve

@@ -18,6 +18,8 @@ board.try_to_solve_using(
         :check_exceeded_numbers_while_accounting_for_two_unknown_gaps,
         :check_try_placing_last_of_certain_digit_in_row,
         :check_try_placing_last_of_certain_digit_in_row_to_avoid_dups,
+        :check_remaining_gap_of_three_with_implicits,
+        :check_exceeded_digits_taking_large_gaps_into_account,
     ]
 );
 

data/lib/binary_puzzle_solver/base.rb

@@ -166,7 +166,19 @@ module Binary_Puzzle_Solver
         end
     end
 
-    class Board
+    class BaseClass
+        def opposite_value(val)
+            if (val == Cell::ZERO)
+                return Cell::ONE
+            elsif (val == Cell::ONE)
+                return Cell::ZERO
+            else
+                raise RuntimeError, "'#{val}' must be zero or one."
+            end
+        end
+    end
+
+    class Board < BaseClass
 
         attr_reader :iters_quota, :num_iters_done
 
@@ -324,18 +336,34 @@ module Binary_Puzzle_Solver
             return @row_summaries[dim][idx]
         end
 
-        def opposite_value(val)
-            if (val == Cell::ZERO)
-                return Cell::ONE
-            elsif (val == Cell::ONE)
-                return Cell::ZERO
-            else
-                raise RuntimeError, "'#{val}' must be zero or one."
+        def _validate_method_list (methods_list)
+            valid_methods_arr = [
+                :check_and_handle_sequences_in_row,
+                :check_and_handle_known_unknown_sameknown_in_row,
+                :check_and_handle_cells_of_one_value_in_row_were_all_found,
+                :check_exceeded_numbers_while_accounting_for_two_unknown_gaps,
+                :check_try_placing_last_of_certain_digit_in_row,
+                :check_try_placing_last_of_certain_digit_in_row_to_avoid_dups,
+                :check_remaining_gap_of_three_with_implicits,
+                :check_exceeded_digits_taking_large_gaps_into_account,
+            ]
+
+            valid_mathods_hash = valid_methods_arr.inject({}) {
+                |h,v| h[v] = true; h
+            }
+
+            methods_list.each do |m|
+                if not valid_mathods_hash.has_key?(m) then
+                    raise RuntimeError, "Method #{m} is not valid to be used."
+                end
             end
         end
 
+
         def try_to_solve_using (params)
             methods_list = params[:methods]
+            _validate_method_list(methods_list)
+
             views = list_views()
 
             catch :out_of_iters do
@@ -620,53 +648,11 @@ module Binary_Puzzle_Solver
 
             row = get_row_handle(row_idx)
 
-            gaps = {}
-
-            next_gap = []
-
-            add_gap = lambda {
-                l = next_gap.length
-                if (l > 0)
-                    if not gaps[l]
-                        gaps[l] = []
-                    end
-                    gaps[l] << next_gap
-                    next_gap = []
-                end
-            }
-
-            row.iter_of_handles().each do |cell_h|
-                if (cell_h.get_state == Cell::UNKNOWN)
-                    next_gap << cell_h.x
-                else
-                    add_gap.call()
-                end
-            end
-
-            add_gap.call()
+            gaps = row.calc_gaps()
 
             if (gaps.has_key?(2)) then
-                implicit_counts = {Cell::ZERO => 0, Cell::ONE => 0,}
-                gaps[2].each do |gap|
-                    x_s = []
-                    if (gap[0] > 0)
-                        x_s << gap[0]-1
-                    end
-                    if (gap[-1] < row.max_idx)
-                        x_s << gap[-1]+1
-                    end
 
-                    bordering_values = {Cell::ZERO => 0, Cell::ONE => 0,}
-                    x_s.each do |x|
-                        bordering_values[row.get_state(x)] += 1
-                    end
-
-                    for v in [Cell::ZERO, Cell::ONE] do
-                       if bordering_values[opposite_value(v)] > 0
-                           implicit_counts[v] += 1
-                       end
-                    end
-                end
+                implicit_counts = row.calc_gaps_implicit_counts(gaps)
 
                 summ = row.get_summary()
 
@@ -788,6 +774,131 @@ module Binary_Puzzle_Solver
             return
         end
 
+        def check_remaining_gap_of_three_with_implicits(params)
+            row_idx = params[:idx]
+
+            row = get_row_handle(row_idx)
+
+            gaps = row.calc_gaps()
+
+            if (gaps.has_key?(2) and gaps.has_key?(3)) then
+
+                implicit_counts = row.calc_gaps_implicit_counts(gaps)
+
+                summ = row.get_summary()
+
+                v = [Cell::ZERO, Cell::ONE].find {
+                    |v| summ.get_count(v) + implicit_counts[v] \
+                        == summ.half_limit() - 1
+                }
+
+                if v then
+                    opposite_val = opposite_value(v)
+                    gap_3 = gaps[3][0]
+
+
+                    # Copied - refactor
+                    for idx in [0,-1] do
+                        opposite_idx = (idx == 0) ? -1 : 0
+                        edge_offset = (idx == 0) ? (-1) : 1
+                        if (gap_3[idx] > 0 and gap_3[idx] < row.max_idx()) then
+                            if (row.get_state(gap_3[idx]+edge_offset) \
+                                == opposite_val) then
+                                perform_and_append_move(
+                                    :coord => row.get_coord(gap_3[opposite_idx]),
+                                    :val => opposite_val,
+                                    :reason => \
+                                    "Gap of 3 with 2 of the value remaining must not form 3 of a kind (with implicits)",
+                                    :dir => row.col_dim()
+                                )
+                            end
+                        end
+                    end
+                end
+            end
+
+            return
+        end
+
+        def check_exceeded_digits_taking_large_gaps_into_account(params)
+            row_idx = params[:idx]
+
+            row = get_row_handle(row_idx)
+
+            gaps = row.calc_gaps()
+            summ = row.get_summary()
+
+            values_sorted = [Cell::ZERO, Cell::ONE].sort { |a,b|
+                summ.get_count(a) <=> summ.get_count(b) }
+
+            v = values_sorted[-1]
+
+            to_add = 0
+            (3 .. row.max_idx()).each do |len|
+                if gaps.has_key?(len) then
+                    to_add += gaps[len].length
+                end
+            end
+
+            if summ.get_count(v) + to_add == summ.half_limit() then
+                opposite_val = opposite_value(v)
+                (3 .. row.max_idx()).each do |len|
+                    if gaps.has_key?(len) then
+                        if (len == 3) then
+                            gaps[len].each do |gap_3|
+                                # Copied - refactor
+                                for idx in [0,-1] do
+                                    opposite_idx = (idx == 0) ? -1 : 0
+                                    edge_offset = (idx == 0) ? (-1) : 1
+                                    if (gap_3[idx] > 0 and gap_3[idx] < row.max_idx()) then
+                                        if (row.get_state(gap_3[idx]+edge_offset) \
+                                            == opposite_val) then
+                                            perform_and_append_move(
+                                                :coord => row.get_coord(gap_3[opposite_idx]),
+                                                :val => opposite_val,
+                                                :reason => \
+                                                "With gaps of 3, exceeded value cannot be at the opposite edge of the opposite value.",
+                                                :dir => row.col_dim()
+                                            )
+                                        end
+                                    end
+                                end
+                            end
+                        elsif (len == 4) then
+                            gaps[len].each do |gap|
+                                [0, -1].each do |i|
+                                    perform_and_append_move(
+                                        :coord => row.get_coord(gap[i]),
+                                        :val => opposite_val,
+                                        :reason => \
+                                        "With gaps of 4, exceeded value cannot be at edges.",
+                                        :dir => row.col_dim()
+                                    )
+                                end
+                            end
+                        elsif (len == 5) then
+                            gaps[len].each do |gap|
+                                o = opposite_val
+                                gap.zip([o,o,v,o,o]) do |pos_v|
+                                    perform_and_append_move(
+                                        :coord => row.get_coord(gap[pos_v[0]]),
+                                        :val => pos_v[1],
+                                        :reason => \
+                                        "With gaps of 5, exceeded value pattern must be 00100.",
+                                        :dir => row.col_dim()
+                                    )
+                                end
+                            end
+                        else # len >= 5
+                            raise GameIntegrityException, "Too large a gap."
+                        end
+                    end
+                end
+            end
+
+            return
+        end
+
         def validate_rows()
             is_final = true
 
@@ -803,7 +914,7 @@ module Binary_Puzzle_Solver
         private :_do_values_have_a_three_in_a_row, :_generic_check_try_placing_last_digit, :_are_values_duplicates
     end
 
-    class RowHandle
+    class RowHandle < BaseClass
         attr_reader :view, :idx
         def initialize (init_view, init_idx)
             @view = init_view
@@ -919,6 +1030,61 @@ module Binary_Puzzle_Solver
 
             return { :is_final => check_for_duplicated(), };
         end
+
+        def calc_gaps
+            gaps = {}
+
+            next_gap = []
+
+            add_gap = lambda {
+                l = next_gap.length
+                if (l > 0)
+                    if not gaps[l]
+                        gaps[l] = []
+                    end
+                    gaps[l] << next_gap
+                    next_gap = []
+                end
+            }
+
+            iter_of_handles().each do |cell_h|
+                if (cell_h.get_state == Cell::UNKNOWN)
+                    next_gap << cell_h.x
+                else
+                    add_gap.call()
+                end
+            end
+
+            add_gap.call()
+
+            return gaps
+        end
+
+        def calc_gaps_implicit_counts(gaps)
+            implicit_counts = {Cell::ZERO => 0, Cell::ONE => 0,}
+            gaps[2].each do |gap|
+                x_s = []
+                if (gap[0] > 0)
+                    x_s << gap[0]-1
+                end
+                if (gap[-1] < max_idx())
+                    x_s << gap[-1]+1
+                end
+
+                bordering_values = {Cell::ZERO => 0, Cell::ONE => 0,}
+                x_s.each do |x|
+                    bordering_values[get_state(x)] += 1
+                end
+
+                for v in [Cell::ZERO, Cell::ONE] do
+                   if bordering_values[opposite_value(v)] > 0
+                       implicit_counts[v] += 1
+                   end
+                end
+            end
+
+            return implicit_counts
+        end
     end
 
     class CellHandle

data/lib/binary_puzzle_solver/version.rb

@@ -1,3 +1,3 @@
 module Binary_Puzzle_Solver
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
 end

data/test/data/boards/binarypuzzle.com/numbered/10x10/easy/1/final.binpuz-board.txt

@@ -0,0 +1,10 @@
+|0110010101|
+|1001100110|
+|1001101010|
+|0110011001|
+|1010100101|
+|0101010110|
+|1001101001|
+|0110110100|
+|1010011010|
+|0101001011|

data/test/data/boards/binarypuzzle.com/numbered/10x10/easy/1/initial.binpuz-board.txt

@@ -0,0 +1,10 @@
+|       1  |
+| 00  0  1 |
+| 0  1  0 0|
+|  1   1   |
+|1 1      1|
+|       1  |
+| 0  1   0 |
+|    11   0|
+| 0 0  1  0|
+|0   0   1 |

data/test/data/boards/binarypuzzle.com/numbered/10x10/hard/1/final.binpuz-board.txt

@@ -0,0 +1,10 @@
+|1101100100|
+|0101011001|
+|0010101011|
+|1011010100|
+|1100110010|
+|0011001101|
+|0100110110|
+|1001001011|
+|0110010101|
+|1010101010|

data/test/data/boards/binarypuzzle.com/numbered/10x10/hard/1/initial.binpuz-board.txt

@@ -0,0 +1,10 @@
+|  0       |
+|0 0  1    |
+|        1 |
+|      0  0|
+|1 00 1    |
+|          |
+|  0  1 1  |
+|1       11|
+|   0      |
+|1   1 1 1 |

data/test/data/boards/binarypuzzle.com/numbered/10x10/hard/2/final.binpuz-board.txt

@@ -0,0 +1,10 @@
+|0110011010|
+|0110100101|
+|1001010101|
+|1001101010|
+|0110010101|
+|1011001010|
+|0101100110|
+|0010110101|
+|1001011010|
+|1100101001|

data/test/data/boards/binarypuzzle.com/numbered/10x10/hard/2/initial.binpuz-board.txt

@@ -0,0 +1,10 @@
+|   0  1  0|
+|  1 1   0 |
+| 0     10 |
+| 0        |
+|    0     |
+|  1      0|
+|   1  0   |
+| 0      0 |
+| 00    0 0|
+|   0  1 0 |

data/test/data/boards/binarypuzzle.com/numbered/12x12/hard/1/final.binpuz-board.txt

@@ -0,0 +1,12 @@
+|011010101100|
+|010100110011|
+|101101010010|
+|001011001101|
+|110100110010|
+|100100101101|
+|011011001010|
+|100101010101|
+|110010110100|
+|001011001011|
+|110101100100|
+|001010011011|

data/test/data/boards/binarypuzzle.com/numbered/12x12/hard/1/initial.binpuz-board.txt

@@ -0,0 +1,12 @@
+|      1 1  0|
+|    0 1   1 |
+|  1 0    0 0|
+|00      1   |
+|    00   0  |
+|  0 0   1   |
+|      00 0 0|
+| 00  1      |
+|  0    1    |
+|00       0  |
+|       00   |
+|00   0      |

data/test/data/boards/binarypuzzle.com/numbered/12x12/very_hard/1/initial.binpuz-board.txt

@@ -0,0 +1,12 @@
+|       00 1 |
+|  1       1 |
+|   0 0  0  0|
+|     0      |
+| 11 1  1 0  |
+| 11 0 00    |
+|          1 |
+|1  00   0   |
+|            |
+|  1     1   |
+|   0  0  0 0|
+|  10   0    |

data/test/data/boards/binarypuzzle.com/numbered/12x12/very_hard/1/intermediate_1.binpuz-board.txt

@@ -0,0 +1,12 @@
+|110100100110|
+|001101001011|
+|110010110100|
+|100100101101|
+|011011010010|
+|011001001101|
+|100110110010|
+|101001010011|
+|010110101100|
+|001101011001|
+|110011010010|
+|001010101101|