no bugs in eclipse update

[linpy.git] / pypol / linear.py

diff --git a/pypol/linear.py b/pypol/linear.py
index fabf2a2..2b064d4 100644 (file)
--- a/pypol/linear.py
+++ b/pypol/linear.py
@@ -1,9 +1,13 @@
-

 import functools
 import numbers
 import functools
 import numbers

+import ctypes, ctypes.util
+from pypol import isl

 
 from fractions import Fraction, gcd
 
 
 from fractions import Fraction, gcd
 

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

 
 __all__ = [
     'Expression',
 
 __all__ = [
     'Expression',


@@ -14,6 +18,8 @@ __all__ = [
 ]
 
 
 ]
 
 

+_CONTEXT = isl.Context()
+

 def _polymorphic_method(func):
     @functools.wraps(func)
     def wrapper(a, b):
 def _polymorphic_method(func):
     @functools.wraps(func)
     def wrapper(a, b):


@@ -26,13 +32,14 @@ def _polymorphic_method(func):
     return wrapper
 
 def _polymorphic_operator(func):
     return wrapper
 
 def _polymorphic_operator(func):

+    # A polymorphic operator should call a polymorphic method, hence we just
+    # have to test the left operand.

     @functools.wraps(func)
     def wrapper(a, b):
         if isinstance(a, numbers.Rational):
             a = constant(a)
     @functools.wraps(func)
     def wrapper(a, b):
         if isinstance(a, numbers.Rational):
             a = constant(a)

-        if isinstance(b, numbers.Rational):
-            b = constant(b)
-        if isinstance(a, Expression) and isinstance(b, Expression):
+            return func(a, b)
+        elif isinstance(a, Expression):

             return func(a, b)
         raise TypeError('arguments must be linear expressions')
     return wrapper
             return func(a, b)
         raise TypeError('arguments must be linear expressions')
     return wrapper


@@ -67,6 +74,7 @@ class Expression:
         self._constant = constant
         return self
 
         self._constant = constant
         return self
 

+

     def symbols(self):
         yield from sorted(self._coefficients)
 
     def symbols(self):
         yield from sorted(self._coefficients)
 


@@ -102,6 +110,12 @@ class Expression:
             yield self.coefficient(symbol)
         yield self.constant
 
             yield self.coefficient(symbol)
         yield self.constant
 

+    def values_int(self):
+        for symbol in self.symbols():
+            return self.coefficient(symbol)
+        return int(self.constant)
+
+

     def symbol(self):
         if not self.issymbol():
             raise ValueError('not a symbol: {}'.format(self))
     def symbol(self):
         if not self.issymbol():
             raise ValueError('not a symbol: {}'.format(self))


@@ -176,7 +190,7 @@ class Expression:
         return NotImplemented
 
     def __rtruediv__(self, other):
         return NotImplemented
 
     def __rtruediv__(self, other):

-        if isinstance(other, Rational):
+        if isinstance(other, self):

             if self.isconstant():
                 constant = Fraction(other, self.constant)
                 return Expression(constant=constant)
             if self.isconstant():
                 constant = Fraction(other, self.constant)
                 return Expression(constant=constant)


@@ -344,9 +358,14 @@ class Polyhedron:
                     if value.denominator != 1:
                         raise TypeError('non-integer constraint: '
                                 '{} <= 0'.format(constraint))
                     if value.denominator != 1:
                         raise TypeError('non-integer constraint: '
                                 '{} <= 0'.format(constraint))

-                self._inequalities.append(constraint)
-        return self
-
+                self._inequalities.append(constraint)      
+        print('in polyhedron')  
+        #print(self.constraints())
+        self._bset = self.to_isl()
+        #print(self._bset)
+        return self 
+   
+  

     @property
     def equalities(self):
         yield from self._equalities
     @property
     def equalities(self):
         yield from self._equalities


@@ -354,24 +373,47 @@ class Polyhedron:
     @property
     def inequalities(self):
         yield from self._inequalities
     @property
     def inequalities(self):
         yield from self._inequalities

+        
+    @property
+    def constant(self):
+        return self._constant
+
+    def isconstant(self):
+        return len(self._coefficients) == 0
+    
+        
+    def isempty(self):
+        return bool(libisl.isl_basic_set_is_empty(self._bset))

 
     def constraints(self):
         yield from self.equalities
         yield from self.inequalities
 
 
     def constraints(self):
         yield from self.equalities
         yield from self.inequalities
 

+

     def symbols(self):
         s = set()
         for constraint in self.constraints():
             s.update(constraint.symbols)
     def symbols(self):
         s = set()
         for constraint in self.constraints():
             s.update(constraint.symbols)

-        yield from sorted(s)
-
+            yield from sorted(s)
+            
+    def symbol_count(self):
+        s = []
+        for constraint in self.constraints():
+            s.append(constraint.symbols)
+        print(s)
+        return s     
+        

     @property
     def dimension(self):
         return len(self.symbols())
 
     def __bool__(self):
         # return false if the polyhedron is empty, true otherwise
     @property
     def dimension(self):
         return len(self.symbols())
 
     def __bool__(self):
         # return false if the polyhedron is empty, true otherwise

-        raise NotImplementedError
+        if self._equalities or self._inequalities:
+            return False
+        else:
+            return True
+        

 
     def __contains__(self, value):
         # is the value in the polyhedron?
 
     def __contains__(self, value):
         # is the value in the polyhedron?


@@ -380,8 +422,8 @@ class Polyhedron:
     def __eq__(self, other):
         raise NotImplementedError
 
     def __eq__(self, other):
         raise NotImplementedError
 

-    def isempty(self):
-        return self == empty
+    def is_empty(self):
+        return

 
     def isuniverse(self):
         return self == universe
 
     def isuniverse(self):
         return self == universe


@@ -401,6 +443,11 @@ class Polyhedron:
 
     def issuperset(self, other):
         # test whether every element in other is in the polyhedron
 
     def issuperset(self, other):
         # test whether every element in other is in the polyhedron

+        for value in other:
+            if value == self.constraints():
+                return True 
+            else:
+                return False     

         raise NotImplementedError
 
     def __ge__(self, other):
         raise NotImplementedError
 
     def __ge__(self, other):


@@ -457,8 +504,54 @@ class Polyhedron:
     @classmethod
     def fromstring(cls, string):
         raise NotImplementedError
     @classmethod
     def fromstring(cls, string):
         raise NotImplementedError

+    
+    def printer(self):
+        
+        ip = libisl.isl_printer_to_str(_CONTEXT)
+        ip = libisl.isl_printer_print_val(ip, self)
+        string = libisl.isl_printer_get_str(ip).decode()
+        print(string)
+        return string
+    
+    
+    def to_isl(self):
+        space = libisl.isl_space_set_alloc(_CONTEXT, 0, len(self.symbol_count()))
+        bset = libisl.isl_basic_set_empty(libisl.isl_space_copy(space))
+        ls = libisl.isl_local_space_from_space(libisl.isl_space_copy(space))
+        ceq = libisl.isl_equality_alloc(libisl.isl_local_space_copy(ls))
+        cin = libisl.isl_inequality_alloc(libisl.isl_local_space_copy(ls))
+        dict_ex = Expression().__dict__
+        '''
+        if there are equalities/inequalities, take each constant and coefficient and add as a constraint to the basic set
+        need to change the symbols method to a lookup table for the integer value for each letter that could be a symbol
+        '''
+        if self.equalities:
+            for _constant in dict_ex:
+                value = dict_ex.get('_constant')
+                ceq = libisl.isl_constraint_set_constant_val(ceq, value)    
+            for _coefficients in dict_ex: 
+                value_co = dict_ex.get('_coefficients')
+                if value_co:       
+                    ceq = libisl.isl_constraint_set_coefficient_si(ceq, libisl.isl_set_dim, self.symbols(), value_co) 
+            bset = libisl.isl_set_add_constraint(bset, ceq)
+                            
+        elif self.inequalities:     
+            for _constant in dict_ex:
+                value = dict_ex.get('_constant')
+                cin = libisl.isl_constraint_set_constant_val(cin, value)    
+            for _coefficients in dict_ex: 
+                value_co = dict_ex.get('_coefficients')   
+                if value_co:
+                    cin = libisl.isl_constraint_set_coefficient_si(cin, libisl.isl_set_dim, self.symbols(), value_co)
+            bset = libisl.isl_set_add_contraint(bset, cin)
+        string = self.printer()   
+        #string = libisl.isl_printer_print_basic_set(bset)
+        print('here')
+        print(string)
+        print(self)
+        return string

 
 

+empty = eq(1, 1)

 
 

-empty = le(1, 0)

 
 universe = Polyhedron()
 
 universe = Polyhedron()