Code cleanup

[linpy.git] / pypol / linear.py

diff --git a/pypol/linear.py b/pypol/linear.py
index d1aa882..331d3af 100644 (file)
--- a/pypol/linear.py
+++ b/pypol/linear.py
@@ -1,17 +1,12 @@
-'''
-VERY MESSY, made notes on where I will change things
-'''
-
+import ctypes, ctypes.util

 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'))
+from . import isl, islhelper
+from .isl import libisl, Context

 
 

-libisl.isl_printer_get_str.restype = ctypes.c_char_p

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


@@ -22,8 +17,6 @@ __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):


@@ -98,6 +91,7 @@ class Expression:
 
     __getitem__ = coefficient
 
 
     __getitem__ = coefficient
 

+    @property

     def coefficients(self):
         for symbol in self.symbols():
             yield symbol, self.coefficient(symbol)
     def coefficients(self):
         for symbol in self.symbols():
             yield symbol, self.coefficient(symbol)


@@ -119,7 +113,6 @@ class Expression:
             return self.coefficient(symbol)
         return int(self.constant)
 
             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))


@@ -140,8 +133,8 @@ class Expression:
 
     @_polymorphic_method
     def __add__(self, other):
 
     @_polymorphic_method
     def __add__(self, other):

-        coefficients = dict(self.coefficients())
-        for symbol, coefficient in other.coefficients():
+        coefficients = dict(self.coefficients)
+        for symbol, coefficient in other.coefficients:

             if symbol in coefficients:
                 coefficients[symbol] += coefficient
             else:
             if symbol in coefficients:
                 coefficients[symbol] += coefficient
             else:


@@ -153,8 +146,8 @@ class Expression:
 
     @_polymorphic_method
     def __sub__(self, other):
 
     @_polymorphic_method
     def __sub__(self, other):

-        coefficients = dict(self.coefficients())
-        for symbol, coefficient in other.coefficients():
+        coefficients = dict(self.coefficients)
+        for symbol, coefficient in other.coefficients:

             if symbol in coefficients:
                 coefficients[symbol] -= coefficient
             else:
             if symbol in coefficients:
                 coefficients[symbol] -= coefficient
             else:


@@ -162,12 +155,13 @@ class Expression:
         constant = self.constant - other.constant
         return Expression(coefficients, constant)
 
         constant = self.constant - other.constant
         return Expression(coefficients, constant)
 

-    __rsub__ = __sub__
+    def __rsub__(self, other):
+        return -(self - other)

 
     @_polymorphic_method
     def __mul__(self, other):
         if other.isconstant():
 
     @_polymorphic_method
     def __mul__(self, other):
         if other.isconstant():

-            coefficients = dict(self.coefficients())
+            coefficients = dict(self.coefficients)

             for symbol in coefficients:
                 coefficients[symbol] *= other.constant
             constant = self.constant * other.constant
             for symbol in coefficients:
                 coefficients[symbol] *= other.constant
             constant = self.constant * other.constant


@@ -250,7 +244,7 @@ class Expression:
 
     def __repr__(self):
         string = '{}({{'.format(self.__class__.__name__)
 
     def __repr__(self):
         string = '{}({{'.format(self.__class__.__name__)

-        for i, (symbol, coefficient) in enumerate(self.coefficients()):
+        for i, (symbol, coefficient) in enumerate(self.coefficients):

             if i != 0:
                 string += ', '
             string += '{!r}: {!r}'.format(symbol, coefficient)
             if i != 0:
                 string += ', '
             string += '{!r}: {!r}'.format(symbol, coefficient)


@@ -283,19 +277,19 @@ class Expression:
 
     @_polymorphic_method
     def __le__(self, other):
 
     @_polymorphic_method
     def __le__(self, other):

-        return Polyhedron(inequalities=[(self - other)._canonify()])
+        return Polyhedron(inequalities=[(other - self)._canonify()])

 
     @_polymorphic_method
     def __lt__(self, other):
 
     @_polymorphic_method
     def __lt__(self, other):

-        return Polyhedron(inequalities=[(self - other)._canonify() + 1])
+        return Polyhedron(inequalities=[(other - self)._canonify() - 1])

 
     @_polymorphic_method
     def __ge__(self, other):
 
     @_polymorphic_method
     def __ge__(self, other):

-        return Polyhedron(inequalities=[(other - self)._canonify()])
+        return Polyhedron(inequalities=[(self - other)._canonify()])

 
     @_polymorphic_method
     def __gt__(self, other):
 
     @_polymorphic_method
     def __gt__(self, other):

-        return Polyhedron(inequalities=[(other - self)._canonify() + 1])
+        return Polyhedron(inequalities=[(self - other)._canonify() - 1])

 
 
 def constant(numerator=0, denominator=None):
 
 
 def constant(numerator=0, denominator=None):


@@ -362,14 +356,15 @@ 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)      
-        print('in polyhedron')  
-        #print(self.constraints())
-        self._bset = self.to_isl()
+                self._inequalities.append(constraint)
+        self._bset = self._to_isl()

         #print(self._bset)
         #print(self._bset)

-        return self 
-   
-  
+        #put this here just to test from isl method
+        #from_isl = self.from_isl(self._bset)
+        #print(from_isl)
+        #rint(self)
+        return self
+

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


@@ -377,15 +372,14 @@ 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
     @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 isempty(self):
         return bool(libisl.isl_basic_set_is_empty(self._bset))
 


@@ -393,19 +387,12 @@ class Polyhedron:
         yield from self.equalities
         yield from self.inequalities
 
         yield from self.equalities
         yield from self.inequalities
 

-

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

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

     @property
     def dimension(self):
         return len(self.symbols())
     @property
     def dimension(self):
         return len(self.symbols())


@@ -416,7 +403,6 @@ class Polyhedron:
             return False
         else:
             return True
             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?


@@ -448,9 +434,9 @@ class Polyhedron:
         # test whether every element in other is in the polyhedron
         for value in other:
             if value == self.constraints():
         # test whether every element in other is in the polyhedron
         for value in other:
             if value == self.constraints():

-                return True 
+                return True

             else:
             else:

-                return False     
+                return False

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


@@ -495,7 +481,7 @@ class Polyhedron:
         for constraint in self.equalities:
             constraints.append('{} == 0'.format(constraint))
         for constraint in self.inequalities:
         for constraint in self.equalities:
             constraints.append('{} == 0'.format(constraint))
         for constraint in self.inequalities:

-            constraints.append('{} <= 0'.format(constraint))
+            constraints.append('{} >= 0'.format(constraint))

         return '{{{}}}'.format(', '.join(constraints))
 
     def __repr__(self):
         return '{{{}}}'.format(', '.join(constraints))
 
     def __repr__(self):


@@ -507,36 +493,75 @@ class Polyhedron:
     @classmethod
     def fromstring(cls, string):
         raise NotImplementedError
     @classmethod
     def fromstring(cls, string):
         raise NotImplementedError

-    
-    def to_isl(self):
-        space = libisl.isl_space_set_alloc(_CONTEXT, 0, len(self.symbol_count()))
+
+    def _symbolunion(self, *others):
+        symbols = set(self.symbols())
+        for other in others:
+            symbols.update(other.symbols())
+        return sorted(symbols)
+
+    def _to_isl(self, symbols=None):
+        if symbols is None:
+            symbols = self.symbols()
+        num_coefficients = len(symbols)
+        ctx = Context()
+        space = libisl.isl_space_set_alloc(ctx, 0, num_coefficients)

         bset = libisl.isl_basic_set_universe(libisl.isl_space_copy(space))
         bset = libisl.isl_basic_set_universe(libisl.isl_space_copy(space))

-        copy = libisl.isl_basic_set_copy(bset)
-        ls = libisl.isl_local_space_from_space(libisl.isl_space_copy(space))
+        ls = libisl.isl_local_space_from_space(space)

         ceq = libisl.isl_equality_alloc(libisl.isl_local_space_copy(ls))
         ceq = libisl.isl_equality_alloc(libisl.isl_local_space_copy(ls))

-        for value in self.equalities:    
-            for value in self.equalities:
-                #need method to get expression value 
-                if self._equalities:
-                    value = self._equalities.method_get_value_from_expression()
-                    ceq = libisl.isl_constraint_set_constant_val(ceq, value ) 
-                    #ceq = libisl.isl_constraint_set_coefficient_si(ceq, libisl.isl_set_dim, self.symbols(), value)                              
-        '''

         cin = libisl.isl_inequality_alloc(libisl.isl_local_space_copy(ls))
         cin = libisl.isl_inequality_alloc(libisl.isl_local_space_copy(ls))

-        for item in self.inequalities:     
-                   for item in self.inequalities:
-                if isinstance(item, int):
-                    cin = libisl.isl_constraint_set_constant_si(cin, item) 
-                else:    
-                    cin = libisl.isl_constraint_set_coefficient_si(cin, libisl.isl_set_dim, self.symbols(), item)
-                    '''
-        bsetfinal = libisl.isl_basic_set_add_contraint(copy, ceq)
-        #bsetfinal = libisl.isl_basic_set_add_contraint(copy, cin)
-        string = libisl.isl_printer_print_basic_set(bsetfinal)
+        '''if there are equalities/inequalities, take each constant and coefficient and add as a constraint to the basic set'''
+        if list(self.equalities): #check if any equalities exist
+            for eq in self.equalities:
+                coeff_eq = dict(eq.coefficients)
+                if eq.constant:
+                    value = eq.constant
+                    ceq = libisl.isl_constraint_set_constant_si(ceq, value)
+                for eq in coeff_eq:
+                    num = coeff_eq.get(eq)
+                    iden = symbols.index(eq)
+                    ceq = libisl.isl_constraint_set_coefficient_si(ceq, islhelper.isl_dim_set, iden, num)  #use 3 for type isl_dim_set
+            bset = libisl.isl_basic_set_add_constraint(bset, ceq)
+        if list(self.inequalities): #check if any inequalities exist
+            for ineq in self.inequalities:
+                coeff_in = dict(ineq.coefficients)
+                if ineq.constant:
+                    value = ineq.constant
+                    cin = libisl.isl_constraint_set_constant_si(cin, value)
+                for ineq in coeff_in:
+                    num = coeff_in.get(ineq)
+                    iden = symbols.index(ineq)
+                    cin = libisl.isl_constraint_set_coefficient_si(cin, islhelper.isl_dim_set, iden, num)  #use 3 for type isl_dim_set
+            bset = libisl.isl_basic_set_add_constraint(bset, cin)
+        ip = libisl.isl_printer_to_str(ctx) #create string printer
+        ip = libisl.isl_printer_print_basic_set(ip, bset) #print basic set to printer
+        string = libisl.isl_printer_get_str(ip)   #get string from printer
+        string = str(string.decode())

         print(string)
         print(string)

-        return self
-
-empty = eq(1, 1)
-
-
-universe = Polyhedron()
+        return bset
+
+    def from_isl(self, bset):
+        '''takes basic set in isl form and puts back into python version of polyhedron
+        isl example code gives isl form as:
+            "{[i] : exists (a : i = 2a and i >= 10 and i <= 42)}")
+            our printer is giving form as:
+            b'{ [i0] : 1 = 0 }' '''
+        #bset = self
+        if self._equalities:
+            constraints = libisl.isl_basic_set_equalities_matrix(bset, 3)
+        elif self._inequalities:
+            constraints = libisl.isl_basic_set_inequalities_matrix(bset, 3)
+        print(constraints)
+        return constraints
+
+empty = None #eq(0,1)
+universe = None #Polyhedron()
+
+if __name__ == '__main__':
+    ex1 = Expression(coefficients={'a': 1, 'x': 2}, constant=2)
+    ex2 = Expression(coefficients={'a': 3  , 'b': 2}, constant=3)
+    p = Polyhedron(inequalities=[ex1, ex2])
+    #p = eq(ex2, 0)# 2a+4 = 0, in fact 6a+3 = 0
+    #p.to_isl()
+
+#universe = Polyhedron()