Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement the -contradictionlimit option #60

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Implement the -contradictionlimit option #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d89a8c
Implement the -contradictionlimit= option
matjojo Aug 30, 2021
e4805d0
Remove a last bit of debug output, whoopsy
matjojo Aug 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion SudokuSolver/Solver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public static void PrintTimers()
public bool DisableWings { get; set; } = false;
public bool DisableContradictions { get; set; } = false;
public bool DisableFindShortestContradiction { get; set; } = false;
public uint? ContradictionStepCountLimit { get; set; } = null;

private uint[,] board;
private int[,] regions = null;
Expand Down Expand Up @@ -274,6 +275,7 @@ public Solver(Solver other)
DisableWings = other.DisableWings;
DisableContradictions = other.DisableContradictions;
DisableFindShortestContradiction = other.DisableFindShortestContradiction;
ContradictionStepCountLimit = other.ContradictionStepCountLimit;
board = (uint[,])other.board.Clone();
regions = other.regions;
seenMap = other.seenMap;
Expand Down Expand Up @@ -3141,7 +3143,8 @@ private LogicResult FindSimpleContradictions(StringBuilder stepDescription)
if (!DisableContradictions)
{
int changes = boardCopy.AmountCellsFilled() - this.AmountCellsFilled();
if (bestContradiction == null || changes < bestContradiction.Changes)
// Plus one here since we don't count the cell without candidates as "step", but the AmountCellsFilled method does
if (changes <= (ContradictionStepCountLimit + 1) && (bestContradiction == null || changes < bestContradiction.Changes))
{
bestContradiction = new ContradictionResult(changes, boardCopy, i, j, v, formattedContraditionReason);
}
Expand Down
3 changes: 3 additions & 0 deletions SudokuSolverConsole/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ static async Task Main(string[] args)
string outputPath = null;
List<string> constraints = new();
bool multiThread = false;
uint? contradictionStepCountLimit = null;
bool solveBruteForce = false;
bool solveRandomBruteForce = false;
bool solveLogically = false;
Expand Down Expand Up @@ -79,6 +80,7 @@ static async Task Main(string[] args)
{ "k|check", "Check if there are 0, 1, or 2+ solutions.", k => check = k != null },
{ "n|solutioncount", "Provide an exact solution count.", n => solutionCount = n != null },
{ "t|multithread", "Use multithreading.", t => multiThread = t != null },
{ "cl|contradictionlimit=", "Largest amount of steps a contradiction may take.", l => contradictionStepCountLimit = uint.Parse(l)},

// Post-solve options
{ "o|out=", "Output solution(s) to file.", o => outputPath = o },
Expand Down Expand Up @@ -217,6 +219,7 @@ static async Task Main(string[] args)
return;
}

solver.ContradictionStepCountLimit = contradictionStepCountLimit;
if (print)
{
Console.WriteLine("Input puzzle:");
Expand Down