Skip to content

Commit

Permalink
Cosmetic Hint changes
Browse files Browse the repository at this point in the history
Minor cosmetic changes to the wording of some Hints & version update
  • Loading branch information
SudokuMonster committed Jul 15, 2020
1 parent 0f0645c commit d7ad3c7
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 20 deletions.
4 changes: 2 additions & 2 deletions diuf/sudoku/Settings.java
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
8 changes: 4 additions & 4 deletions diuf/sudoku/solver/rules/GroupedStrongLinksHint.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ <h2>{0}</h2>
<p>
This technique relies on <b>Conjugate Pairs</b> that infer a strong link
and/or a special arrangement of values in a line or block also known as
<b>Grouped Strong Links</b> (where a strong link is inferred from a groups of
<b>Grouped Strong Links</b> (where a strong link is inferred from groups of
cells having the same value). These use strong links in <u>L</u>ocation inferred
from <u>1</u> value (L1), therfore, <b>Grouped L1-Wing</b> can be used to describe
this pattern.
this pattern.(Currently, L1 is reserved for 3 strong links).
</p>
<p>
the arrangement of cells with value <b>{1}</b> in <b>{2}</b> and <b>{3}</b>
Expand All @@ -17,7 +17,7 @@ <h2>{0}</h2>
</p>
<p>
Any occurrence of the value <b>{1}</b> can therefore be removed from
any cells sharing a row, column or block with <u><i>ALL</i></u> cells with
any cells sharing a region or regions with <u><i>ALL</i></u> cells with
value <b>{1}</b> in <b>{11}</b> and <b>{3}</b> that are not part of <b>{12}</b> or <b>{7}</b>.
</p>
<p>
Expand All @@ -35,7 +35,7 @@ <h2>{0}</h2>
<p>
The inference of a strong link from a group of cells with value <b>{1}</b> 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)".
</p>
Expand Down
8 changes: 4 additions & 4 deletions diuf/sudoku/solver/rules/GroupedStrongLinksLoopHint.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ <h2>{0}</h2>
<p>
This technique relies on <b>Conjugate Pairs</b> that infer a strong link
and/or a special arrangement of values in a line or block also known as
<b>Grouped Strong Links</b> (where a strong link is inferred from a groups of
<b>Grouped Strong Links</b> (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 <u>L</u>ocation inferred from <u>1</u> value (L1), therfore, <b>L1-Ring</b> can
be used to describe this loop (Currently, L1 is reserved for 3 strong links).
Expand All @@ -14,11 +14,11 @@ <h2>{0}</h2>
(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 <b>{6}</b>, <b>{7}</b> and <b>{13}</b>
(Red outlined region) forming a loop.
(Red outlined region) forming a loop/ring.
</p>
<p>
Any occurrence of the value <b>{1}</b> can therefore be removed from
any cells sharing a row, column or block with <u><i>ALL</i></u> cells with
any cells sharing a region or regions with <u><i>ALL</i></u> cells with
value <b>{1}</b> in ANY of <b>{6}</b>, <b>{7}</b> or <b>{13}</b> outside
of <b>{2}</b> and <b>{3}</b>.
</p>
Expand All @@ -37,7 +37,7 @@ <h2>{0}</h2>
<p>
The inference of a strong link from a group of cells with value <b>{1}</b> 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)".
</p>
Expand Down
9 changes: 5 additions & 4 deletions diuf/sudoku/solver/rules/StrongLinksHint.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,21 @@ <h2>{0}</h2>
<p>
This technique relies on <b>Conjugate Pairs</b>.
The value <b>{1}</b> in <b>{2}</b> and <b>{3}</b> forms
{4} (regional) strong links or conjugate pairs. {5} sets of <i>bridge</i> cells
{4} (regional) strong links or conjugate pairs with {5} set(s) of <i>bridge</i> cells
in <b>{6}</b> and <b>{7}</b>. The {4} strong links are joined therefore with
these {5} <i>weak</i> links.
{5} <i>weak</i> link(s).
</p>
<p>
Any occurrence of the value <b>{1}</b> can be removed from any cells sharing
a row, column or block with <i>both start and end</i> cells <b>{8}</b> and <b>{9}</b>.
a region or regions with <i>both start and end</i> cells <b>{8}</b> and <b>{9}</b>.
</p>
<p>
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 <u>L</u>ocation inferred from <u>1</u> value (L1), therfore,
<b>L1-Wing</b> can be used to describe this pattern.
<b>L1-Wing</b> can be used to describe this pattern (Currently L1 is used with 3 strong
links only).
</p>
</body>
</html>
11 changes: 6 additions & 5 deletions diuf/sudoku/solver/rules/VLocking.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
<body>
<h2>{2}</h2>
<p>
The <b1>{0}</b1> <u>Must</u> have a cell with <g><b>value {1}</b></g> in the solution.
<b>{0}</b> <u>Must</u> have a cell with <g><b>value {1}</b></g> in the solution.
</p>
<p>
<r>Other occurrences of <g><b>value {1}</b></g></r> outside the <b1>{0}</b1> which
share region/regions with <b><u>all cells</u></b> with <g><b>value {1}</b></g> in <b1>{0}</b1>
can be safely eliminated. This technique covers pointing & claiming and can be thought of as a
Generalized intersections technique that suits variant regions specifically.
<r>Other occurrences of <g><b>value {1}</b></g></r> outside <b>{0}</b> which
intersect (share region/regions) with <b><u>all cells</u></b> with <g><b>value {1}</b></g>
in <b>{0}</b> 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.
</p>
</body>
</html>
2 changes: 1 addition & 1 deletion diuf/sudoku/solver/rules/VLockingHint.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit d7ad3c7

Please sign in to comment.