X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fpycsolver.py;h=7c3440e03b028eb794797b097eb9d23505e36ea7;hp=3dd296b7c6c6ba0cb77a221c2026af2c8ef65fcf;hb=7c9674de2cb89d53417b40756b100292198c039e;hpb=c4d7cd37081ba21f4b979a3e82659c2df73f251a

diff --git a/src/pycsolver.py b/src/pycsolver.py
index 3dd296b..7c3440e 100644
--- a/src/pycsolver.py
+++ b/src/pycsolver.py
@@ -35,7 +35,7 @@ def loadCSolver():
         csolverlb.createSet.restype = c_void_p
         csolverlb.getElementVar.argtypes = [c_void_p, c_void_p]
         csolverlb.getElementVar.restype = c_void_p
-        csolverlb.createPredicateOperator.argtypes = [c_void_p, c_uint, POINTER(c_void_p), c_uint]
+        csolverlb.createPredicateOperator.argtypes = [c_void_p, c_uint]
         csolverlb.createPredicateOperator.restype = c_void_p
         csolverlb.applyPredicate.argtypes = [c_void_p, c_void_p, POINTER(c_void_p), c_uint]
         csolverlb.applyPredicate.restype = c_void_p
@@ -65,15 +65,15 @@ def loadCSolver():
 	csolverlb.getElementRange.restype = c_void_p
 	csolverlb.getBooleanVar.argtypes = [c_void_p, c_uint]
 	csolverlb.getBooleanVar.restype = c_void_p
-	csolverlb.createFunctionOperator.argtypes = [c_void_p, c_uint, POINTER(c_void_p), c_uint, c_void_p, c_uint]
+	csolverlb.createFunctionOperator.argtypes = [c_void_p, c_uint, c_void_p, c_uint]
 	csolverlb.createFunctionOperator.restype = c_void_p
-	csolverlb.createPredicateOperator.argtypes = [c_void_p, c_uint, POINTER(c_void_p), c_uint]
+	csolverlb.createPredicateOperator.argtypes = [c_void_p, c_uint]
 	csolverlb.createPredicateOperator.restype = c_void_p
 	csolverlb.createPredicateTable.argtypes = [c_void_p, c_void_p, c_uint]
 	csolverlb.createPredicateTable.restype = c_void_p
-	csolverlb.createTable.argtypes = [c_void_p, POINTER(c_void_p), c_uint, c_void_p]
+	csolverlb.createTable.argtypes = [c_void_p, c_void_p]
 	csolverlb.createTable.restype = c_void_p
-	csolverlb.createTableForPredicate.argtypes = [c_void_p, POINTER(c_void_p), c_uint]
+	csolverlb.createTableForPredicate.argtypes = [c_void_p]
 	csolverlb.createTableForPredicate.restype = c_void_p
 	csolverlb.addTableEntry.argtypes = [c_void_p, c_void_p, c_void_p, c_uint, c_long]
 	csolverlb.addTableEntry.restype = None
@@ -99,6 +99,8 @@ def loadCSolver():
 	csolverlb.orderConstraint.restype = c_void_p
 	csolverlb.solve.argtypes = [c_void_p]
 	csolverlb.solve.restype = c_int
+        csolverlb.mustHaveValue.argtypes = [c_void_p, c_void_p]
+	csolverlb.mustHaveValue.restype = c_void_p
 	csolverlb.getElementValue.argtypes = [c_void_p, c_void_p]
 	csolverlb.getElementValue.restype = c_long
 	csolverlb.getBooleanValue.argtypes = [c_void_p, c_void_p]
@@ -107,7 +109,11 @@ def loadCSolver():
 	csolverlb.getOrderConstraintValue.restype = c_int
 	csolverlb.printConstraints.argtypes = [c_void_p]
 	csolverlb.printConstraints.restype = None
+        csolverlb.clone.argtypes = [c_void_p]
+	csolverlb.clone.restype = c_void_p
 	csolverlb.serialize.argtypes = [c_void_p]
 	csolverlb.serialize.restype = None
+        csolverlb.setAlloyEncoder.argtypes = [c_void_p]
+	csolverlb.setAlloyEncoder.restype = None
 	return csolverlb