From: Hamed Gorjiara <hgorjiar@uci.edu>
Date: Wed, 25 Jul 2018 05:44:16 +0000 (-0700)
Subject: Changing the API for Sudoku
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=786a18382eb5df0724531b40761137cca69b051e;p=Benchmarks_CSolver.git

Changing the API for Sudoku
---

diff --git a/.gitignore b/.gitignore
index 9df04bae..f7c623c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,6 @@
 BlackBox/
 decamouflage/
 hexiom/
+
+# Format
+DUMP*
diff --git a/sudoku-csolver/.gitignore b/sudoku-csolver/.gitignore
index b841f0a1..31dfede4 100644
--- 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 b8599a1c..48ec18b0 100644
--- 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 d0d4c98c..f2e73287 100644
--- 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)))