X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;ds=inline;f=src%2Fpycsolver.py;h=905d1d775a8fd25b99a947e77d67b8d8d010b66d;hb=3e65b7dbdb78b63c39350090a5c5bb4eec4f4af9;hp=3dd296b7c6c6ba0cb77a221c2026af2c8ef65fcf;hpb=c0c4f17e45f0e5b7881a9f041a4cd5e09f3276ba;p=satune.git

diff --git a/src/pycsolver.py b/src/pycsolver.py
index 3dd296b..905d1d7 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
@@ -87,6 +87,8 @@ def loadCSolver():
 	csolverlb.applyPredicate.restype = c_void_p
 	csolverlb.applyLogicalOperation.argtypes = [c_void_p, c_uint, c_void_p, c_uint]
 	csolverlb.applyLogicalOperation.restype = c_void_p
+	csolverlb.applyExactlyOneConstraint.argtypes = [c_void_p, c_void_p, c_uint]
+	csolverlb.applyExactlyOneConstraint.restype = c_void_p
 	csolverlb.applyLogicalOperationTwo.argtypes = [c_void_p, c_uint, c_void_p, c_void_p]
 	csolverlb.applyLogicalOperationTwo.restype = c_void_p
 	csolverlb.applyLogicalOperationOne.argtypes = [c_void_p, c_uint, c_void_p]
@@ -99,15 +101,25 @@ def loadCSolver():
 	csolverlb.orderConstraint.restype = c_void_p
 	csolverlb.solve.argtypes = [c_void_p]
 	csolverlb.solve.restype = c_int
+	csolverlb.solveIncremental.argtypes = [c_void_p]
+	csolverlb.solveIncremental.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.getElementValue.restype = c_void_p
+	csolverlb.freezeElement.argtypes = [c_void_p, c_void_p]
+	csolverlb.freezeElement.restype = c_long
 	csolverlb.getBooleanValue.argtypes = [c_void_p, c_void_p]
 	csolverlb.getBooleanValue.restype = c_int
 	csolverlb.getOrderConstraintValue.argtypes = [c_void_p, c_void_p, c_long, c_long]
 	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.setInterpreter.argtypes = [c_void_p, c_uint]
+	csolverlb.setInterpreter.restype = None
 	return csolverlb