From: Hamed Gorjiara <hgorjiar@uci.edu>
Date: Thu, 12 Apr 2018 18:50:54 +0000 (-0700)
Subject: Adding logicOps and Compop in python API
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=commitdiff_plain;h=2c10a426feff18b5983fd42f4d98c82a7e913a5c;hp=371c6c4af7b2a002c908b31add3f56ea0d6e1bb0;ds=sidebyside

Adding logicOps and Compop in python API
---

diff --git a/src/Test/pycsolvertest.py b/src/Test/pycsolvertest.py
index ca269ed..8895e89 100644
--- a/src/Test/pycsolvertest.py
+++ b/src/Test/pycsolvertest.py
@@ -1,7 +1,6 @@
 import pycsolver as ps
 from ctypes import *
 
-SATC_EQUALS = 0
 
 def main():
 	csolverlb = ps.loadCSolver()
@@ -16,7 +15,7 @@ def main():
         e2 = csolverlb.getElementVar(solver,s2)
         d = [s1, s2]
 	domain = (c_void_p*len(d))(*d)
-        equals = csolverlb.createPredicateOperator(solver,c_uint(SATC_EQUALS), domain, c_uint(2));
+        equals = csolverlb.createPredicateOperator(solver,c_uint(ps.CompOp.SATC_EQUALS), domain, c_uint(2));
         inp = [e1, e2];
 	inputs = (c_void_p*len(inp))(*inp)
         b = csolverlb.applyPredicate(solver,equals, inputs, c_uint(2));
diff --git a/src/pycsolver.py b/src/pycsolver.py
index e79905d..32a8415 100644
--- a/src/pycsolver.py
+++ b/src/pycsolver.py
@@ -1,5 +1,20 @@
 from ctypes import *
 
+class LogicOps:
+	SATC_AND=0
+	SATC_OR=1
+	SATC_NOT=2
+	SATC_XOR=3
+	SATC_IFF=4
+	SATC_IMPLIES=5
+
+class CompOp:
+	SATC_EQUALS = 0
+	SATC_LT=1
+	SATC_GT=2
+	SATC_LTE=3
+	SATC_GTE=4
+
 def loadCSolver():
         csolverlb = cdll.LoadLibrary("lib_cons_comp.so")
         csolverlb.createCCSolver.restype = c_void_p