Changing the API for Sudoku

diff --git a/.gitignore b/.gitignore
index 9df04bae0672a01615a7eba53f0530fcf5dda7f6..f7c623c7eb44ef7be42c91d75abecfff0f01f07c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,6 @@
 BlackBox/
 decamouflage/
 hexiom/
+
+# Format
+DUMP*

diff --git a/sudoku-csolver/.gitignore b/sudoku-csolver/.gitignore
index b841f0a12a28a3f9d67de5c8ae87c94eb24dae3f..31dfede482ace9253d418b93340c3133bb224b73 100644 (file)
--- a/sudoku-csolver/.gitignore
+++ b/sudoku-csolver/.gitignore
@@ -6,3 +6,4 @@ bin/
 csolver
 *.class
 *.so
+*.pyc

diff --git a/sudoku-csolver/Sudoku.py b/sudoku-csolver/Sudoku.py
index b8599a1c59d810a29a1fdabd41cccf9acb100e5a..48ec18b0bf639670f843060cf56232ebf3ea962e 100644 (file)
--- a/sudoku-csolver/Sudoku.py
+++ b/sudoku-csolver/Sudoku.py
@@ -51,8 +51,8 @@ def help():
        print('Sudoku.py -h [or] --hard')
        print('Sudoku.py -v [or] --evil')
        print('Sudoku.py -b [or] --blank')
-       print('Sudoku.py --file file.problem')
-       print('Sudoku.py --gen 9 20')
+       print('Sudoku.py --file file.problem [--csolver]')
+       print('Sudoku.py --gen 9 20 [--csolver]')
        print('All problems generated by websudoku.com')
        sys.exit()
 

diff --git a/sudoku-csolver/csolversudoku.py b/sudoku-csolver/csolversudoku.py
index d0d4c98cfe5927bd7a0e31e93d0bc38eee663b96..f2e732873b73addc738dcd0fae7acb43219f9525 100644 (file)
--- a/sudoku-csolver/csolversudoku.py
+++ b/sudoku-csolver/csolversudoku.py
@@ -63,7 +63,7 @@ def generateSudokuConstraints(N, sudoku = None):
                                        sj = csolverlb.getElementRange(solver,ej)
                                        d = [si,sj]
                                        domain = (c_void_p *len(d))(*d)
-                                       equals = csolverlb.createPredicateOperator(solver, c_uint(ps.CompOp.SATC_EQUALS), domain, c_uint(2))
+                                       equals = csolverlb.createPredicateOperator(solver, c_uint(ps.CompOp.SATC_EQUALS))
                                        inp = [ei,ej]
                                        inputs = (c_void_p*len(inp))(*inp)
                                        b = csolverlb.applyPredicate(solver,equals, inputs, c_uint(2))
@@ -80,7 +80,7 @@ def generateSudokuConstraints(N, sudoku = None):
                                sconst = csolverlb.getElementRange(solver,econst)
                                d = [s1,sconst]
                                domain = (c_void_p *len(d))(*d)
-                               equals = csolverlb.createPredicateOperator(solver, c_uint(ps.CompOp.SATC_EQUALS), domain, c_uint(2))
+                               equals = csolverlb.createPredicateOperator(solver, c_uint(ps.CompOp.SATC_EQUALS))
                                inp = [elem,econst]
                                inputs = (c_void_p*len(inp))(*inp)
                                constr.append( csolverlb.applyPredicate(solver,equals, inputs, c_uint(2)))