Adding logicOps and Compop in python API

diff --git a/src/Test/pycsolvertest.py b/src/Test/pycsolvertest.py
index ca269eddb88def9dbd633f5d3a0c5fb1c72a30cf..8895e89628ed430cb1e60a86ca6b1a86c703b163 100644 (file)
--- a/src/Test/pycsolvertest.py
+++ b/src/Test/pycsolvertest.py
@@ -1,7 +1,6 @@
 import pycsolver as ps
 from ctypes import *
 
 import pycsolver as ps
 from ctypes import *
 

-SATC_EQUALS = 0

 
 def main():
        csolverlb = ps.loadCSolver()
 
 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)
         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));
         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 e79905d550038e88857aa1fc221ce12ab32115e3..32a8415b9da431b24a941c4c48b0154d6a527d4e 100644 (file)
--- a/src/pycsolver.py
+++ b/src/pycsolver.py
@@ -1,5 +1,20 @@
 from ctypes import *
 
 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
 def loadCSolver():
         csolverlb = cdll.LoadLibrary("lib_cons_comp.so")
         csolverlb.createCCSolver.restype = c_void_p