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

diff --git a/src/pycsolver.py b/src/pycsolver.py
index 7c3440e..f08d164 100644
--- a/src/pycsolver.py
+++ b/src/pycsolver.py
@@ -65,6 +65,10 @@ def loadCSolver():
 	csolverlb.getElementRange.restype = c_void_p
 	csolverlb.getBooleanVar.argtypes = [c_void_p, c_uint]
 	csolverlb.getBooleanVar.restype = c_void_p
+	csolverlb.getBooleanTrue.argtypes = [c_void_p]
+	csolverlb.getBooleanTrue.restype = c_void_p
+	csolverlb.getBooleanFalse.argtypes = [c_void_p]
+	csolverlb.getBooleanFalse.restype = c_void_p
 	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]
@@ -87,6 +91,10 @@ 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.applyAtMostOneConstraint.argtypes = [c_void_p, c_void_p, c_uint]
+	csolverlb.applyAtMostOneConstraint.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,21 +107,27 @@ 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.turnoffOptimizations.argtypes = [c_void_p]
+	csolverlb.turnoffOptimizations.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
+        csolverlb.setInterpreter.argtypes = [c_void_p, c_uint]
+	csolverlb.setInterpreter.restype = None
 	return csolverlb