diff --git a/diuf/sudoku/Settings.java b/diuf/sudoku/Settings.java index 66dad9d..07e16b9 100644 --- a/diuf/sudoku/Settings.java +++ b/diuf/sudoku/Settings.java @@ -18,8 +18,8 @@ public class Settings { public final static int VERSION = 1; public final static int REVISION = 17; - public final static String SUBREV = ".6"; - public final static String releaseDate = "2020-07-10"; + public final static String SUBREV = ".7"; + public final static String releaseDate = "2020-07-15"; public final static String releaseYear = "2020"; public final static String releaseLicence = "Lesser General Public License"; public final static String releaseLicenceMini = "LGPL"; diff --git a/diuf/sudoku/solver/rules/GroupedStrongLinksHint.html b/diuf/sudoku/solver/rules/GroupedStrongLinksHint.html index acd2713..ba2b5a9 100644 --- a/diuf/sudoku/solver/rules/GroupedStrongLinksHint.html +++ b/diuf/sudoku/solver/rules/GroupedStrongLinksHint.html @@ -4,10 +4,10 @@

{0}

This technique relies on Conjugate Pairs that infer a strong link and/or a special arrangement of values in a line or block also known as - Grouped Strong Links (where a strong link is inferred from a groups of + Grouped Strong Links (where a strong link is inferred from groups of cells having the same value). These use strong links in Location inferred from 1 value (L1), therfore, Grouped L1-Wing can be used to describe - this pattern. + this pattern.(Currently, L1 is reserved for 3 strong links).

the arrangement of cells with value {1} in {2} and {3} @@ -17,7 +17,7 @@

{0}

Any occurrence of the value {1} can therefore be removed from - any cells sharing a row, column or block with ALL cells with + any cells sharing a region or regions with ALL cells with value {1} in {11} and {3} that are not part of {12} or {7}.

@@ -35,7 +35,7 @@

{0}

The inference of a strong link from a group of cells with value {1} in any region can be spotted when a an "Empty mini Area (EmA)" is observed. This EmA - could be an empty mini-Line (EmL) in a row, column or block. In the case of "Empty + could be an empty mini-Line (EmL) in a region or regions. In the case of "Empty rectangle" the EmA is a group of empty cells that can also be referred to as "Empty mini Rectangle (EmR)".

diff --git a/diuf/sudoku/solver/rules/GroupedStrongLinksLoopHint.html b/diuf/sudoku/solver/rules/GroupedStrongLinksLoopHint.html index 4cfa87d..a8a62f4 100644 --- a/diuf/sudoku/solver/rules/GroupedStrongLinksLoopHint.html +++ b/diuf/sudoku/solver/rules/GroupedStrongLinksLoopHint.html @@ -4,7 +4,7 @@

{0}

This technique relies on Conjugate Pairs that infer a strong link and/or a special arrangement of values in a line or block also known as - Grouped Strong Links (where a strong link is inferred from a groups of + Grouped Strong Links (where a strong link is inferred from groups of cells having the same value) that form a loop (an X-Loop). These use strong links in Location inferred from 1 value (L1), therfore, L1-Ring can be used to describe this loop (Currently, L1 is reserved for 3 strong links). @@ -14,11 +14,11 @@

{0}

(Green outlined region) form strong links (conjugate pairs, shown as green values) or grouped strong links (orange cell outline or yellow cell background). These strong links are weakly linked to each other via {6}, {7} and {13} - (Red outlined region) forming a loop. + (Red outlined region) forming a loop/ring.

Any occurrence of the value {1} can therefore be removed from - any cells sharing a row, column or block with ALL cells with + any cells sharing a region or regions with ALL cells with value {1} in ANY of {6}, {7} or {13} outside of {2} and {3}.

@@ -37,7 +37,7 @@

{0}

The inference of a strong link from a group of cells with value {1} in any region can be spotted when a an "Empty mini Area (EmA)" is observed. This EmA - could be an empty mini-Line (EmL) in a row, column or block. In the case of "Empty + could be an empty mini-Line (EmL) in a region or regions. In the case of "Empty rectangle" the EmA is a group of empty cells that can also be referred to as "Empty mini Rectangle (EmR)".

diff --git a/diuf/sudoku/solver/rules/StrongLinksHint.html b/diuf/sudoku/solver/rules/StrongLinksHint.html index fd29950..9602fac 100644 --- a/diuf/sudoku/solver/rules/StrongLinksHint.html +++ b/diuf/sudoku/solver/rules/StrongLinksHint.html @@ -4,20 +4,21 @@

{0}

This technique relies on Conjugate Pairs. The value {1} in {2} and {3} forms - {4} (regional) strong links or conjugate pairs. {5} sets of bridge cells + {4} (regional) strong links or conjugate pairs with {5} set(s) of bridge cells in {6} and {7}. The {4} strong links are joined therefore with - these {5} weak links. + {5} weak link(s).

Any occurrence of the value {1} can be removed from any cells sharing - a row, column or block with both start and end cells {8} and {9}. + a region or regions with both start and end cells {8} and {9}.

This technique is closely related to {10} technique logic, Coloring technique or L1-Wing technique. It is a subcategory of X-Chains group of techniques which is in itself a subgroup of Alternating Inference Chains (AIC) group of techniques. These use strong links in Location inferred from 1 value (L1), therfore, - L1-Wing can be used to describe this pattern. + L1-Wing can be used to describe this pattern (Currently L1 is used with 3 strong + links only).

\ No newline at end of file diff --git a/diuf/sudoku/solver/rules/VLocking.html b/diuf/sudoku/solver/rules/VLocking.html index b2c979d..57b1d81 100644 --- a/diuf/sudoku/solver/rules/VLocking.html +++ b/diuf/sudoku/solver/rules/VLocking.html @@ -2,13 +2,14 @@

{2}

- The {0} Must have a cell with value {1} in the solution. + {0} Must have a cell with value {1} in the solution.

- Other occurrences of value {1} outside the {0} which - share region/regions with all cells with value {1} in {0} - can be safely eliminated. This technique covers pointing & claiming and can be thought of as a - Generalized intersections technique that suits variant regions specifically. + Other occurrences of value {1} outside {0} which + intersect (share region/regions) with all cells with value {1} + in {0} can be safely eliminated. This technique covers pointing & claiming and can + be thought of as Generalized intersections or Locked Candidates technique that suits variant + regions specifically.

\ No newline at end of file diff --git a/diuf/sudoku/solver/rules/VLockingHint.java b/diuf/sudoku/solver/rules/VLockingHint.java index 6dc2574..a3cab26 100644 --- a/diuf/sudoku/solver/rules/VLockingHint.java +++ b/diuf/sudoku/solver/rules/VLockingHint.java @@ -132,7 +132,7 @@ public String toString() { public String toHtml(Grid grid) { String result; result = HtmlLoader.loadHtml(this, "VLocking.html"); - String region = lockedRegion.toString(); + String region = lockedRegion.toFullString(); String ruleName = getName(); result = HtmlLoader.format(result, region, Value, ruleName); return result;