add small isl changes

[linpy.git] / pypol / isl.py

diff --git a/pypol/isl.py b/pypol/isl.py
index 758fb79..41716c1 100644 (file)
--- a/pypol/isl.py
+++ b/pypol/isl.py
@@ -1,19 +1,34 @@
+"""
+note: for islpy
+isl format: basic set: ("{[x, y] : x >= 0 and x < 5 and y >= 0 and y < x+4 }")
+"""

 
 import ctypes, ctypes.util
 import math
 import numbers
 import operator
 import re
 
 import ctypes, ctypes.util
 import math
 import numbers
 import operator
 import re

+import functools
+

 
 from decimal import Decimal
 from fractions import Fraction
 from functools import wraps
 
 
 from decimal import Decimal
 from fractions import Fraction
 from functools import wraps
 

-

 libisl = ctypes.CDLL(ctypes.util.find_library('isl'))
 
 libisl.isl_printer_get_str.restype = ctypes.c_char_p
 
 libisl = ctypes.CDLL(ctypes.util.find_library('isl'))
 
 libisl.isl_printer_get_str.restype = ctypes.c_char_p
 

+def _polymorphic_method(func):
+    @functools.wraps(func)
+    def wrapper(self, other):
+        if isinstance(other, Value):
+            return func(self, other)
+        if isinstance(other, numbers.Rational):
+            other = Value(self.context, other)
+            return func(self, other)
+        raise TypeError('operand should be a Value or a Rational')
+    return wrapper

 
 class Context:
 
 
 class Context:
 


@@ -26,8 +41,8 @@ class Context:
     def _as_parameter_(self):
         return self._ic
 
     def _as_parameter_(self):
         return self._ic
 

-    def __del__(self):
-        libisl.isl_ctx_free(self)
+    #def __del__(self):
+     #   libisl.isl_ctx_free(self)

 
     def __eq__(self, other):
         if not isinstance(other, Context):
 
     def __eq__(self, other):
         if not isinstance(other, Context):


@@ -104,12 +119,20 @@ class Value:
             numerator = libisl.isl_val_read_from_str(context, numerator)
             denominator = str(frac.denominator).encode()
             denominator = libisl.isl_val_read_from_str(context, denominator)
             numerator = libisl.isl_val_read_from_str(context, numerator)
             denominator = str(frac.denominator).encode()
             denominator = libisl.isl_val_read_from_str(context, denominator)

-            self._iv = libisl.isl_val_div(numerator, denominator)
+            self._iv = libisl.isl_val_div(numerator, denominator)    
+        print('in isl')            

         return self
 
         return self
 

+

     @property
     def _as_parameter_(self):
         return self._iv
     @property
     def _as_parameter_(self):
         return self._iv

+    
+    def symbols(self):
+        s = set()
+        for constraint in self.constraints():
+            s.update(constraint.symbols)
+        yield from sorted(s)

 
     def __del__(self):
         libisl.isl_val_free(self)
 
     def __del__(self):
         libisl.isl_val_free(self)


@@ -124,40 +147,29 @@ class Value:
     @property
     def denominator(self):
         if self._denominator is None:
     @property
     def denominator(self):
         if self._denominator is None:

-            raise ValueError('not a rational number')
+            raise ValueError('not a rational number')        

         return self._denominator
 
     def __bool__(self):
         return not bool(libisl.isl_val_is_zero(self))
 
         return self._denominator
 
     def __bool__(self):
         return not bool(libisl.isl_val_is_zero(self))
 

-    def _polymorphic(func):
-        @wraps(func)
-        def wrapper(self, other):
-            if isinstance(other, Value):
-                return func(self, other)
-            if isinstance(other, numbers.Rational):
-                other = Value(self.context, other)
-                return func(self, other)
-            raise TypeError('operand should be a Value or a Rational')
-        return wrapper
-
-    @_polymorphic
+    @_polymorphic_method

     def __lt__(self, other):
         return bool(libisl.isl_val_lt(self, other))
 
     def __lt__(self, other):
         return bool(libisl.isl_val_lt(self, other))
 

-    @_polymorphic
+    @_polymorphic_method

     def __le__(self, other):
         return bool(libisl.isl_val_le(self, other))
 
     def __le__(self, other):
         return bool(libisl.isl_val_le(self, other))
 

-    @_polymorphic
+    @_polymorphic_method

     def __gt__(self, other):
         return bool(libisl.isl_val_gt(self, other))
 
     def __gt__(self, other):
         return bool(libisl.isl_val_gt(self, other))
 

-    @_polymorphic
+    @_polymorphic_method

     def __ge__(self, other):
         return bool(libisl.isl_val_ge(self, other))
 
     def __ge__(self, other):
         return bool(libisl.isl_val_ge(self, other))
 

-    @_polymorphic
+    @_polymorphic_method

     def __eq__(self, other):
         return bool(libisl.isl_val_eq(self, other))
 
     def __eq__(self, other):
         return bool(libisl.isl_val_eq(self, other))
 


@@ -192,7 +204,7 @@ class Value:
         val = libisl.isl_val_trunc(val)
         return self.__class__(self.context, self._ptr(val))
 
         val = libisl.isl_val_trunc(val)
         return self.__class__(self.context, self._ptr(val))
 

-    @_polymorphic
+    @_polymorphic_method

     def __add__(self, other):
         val1 = libisl.isl_val_copy(self)
         val2 = libisl.isl_val_copy(other)
     def __add__(self, other):
         val1 = libisl.isl_val_copy(self)
         val2 = libisl.isl_val_copy(other)


@@ -201,7 +213,7 @@ class Value:
 
     __radd__ = __add__
 
 
     __radd__ = __add__
 

-    @_polymorphic
+    @_polymorphic_method

     def __sub__(self, other):
         val1 = libisl.isl_val_copy(self)
         val2 = libisl.isl_val_copy(other)
     def __sub__(self, other):
         val1 = libisl.isl_val_copy(self)
         val2 = libisl.isl_val_copy(other)


@@ -210,7 +222,7 @@ class Value:
 
     __rsub__ = __sub__
 
 
     __rsub__ = __sub__
 

-    @_polymorphic
+    @_polymorphic_method

     def __mul__(self, other):
         val1 = libisl.isl_val_copy(self)
         val2 = libisl.isl_val_copy(other)
     def __mul__(self, other):
         val1 = libisl.isl_val_copy(self)
         val2 = libisl.isl_val_copy(other)


@@ -219,7 +231,7 @@ class Value:
 
     __rmul__ = __mul__
 
 
     __rmul__ = __mul__
 

-    @_polymorphic
+    @_polymorphic_method

     def __truediv__(self, other):
         val1 = libisl.isl_val_copy(self)
         val2 = libisl.isl_val_copy(other)
     def __truediv__(self, other):
         val1 = libisl.isl_val_copy(self)
         val2 = libisl.isl_val_copy(other)