Verbose output for make test

[linpy.git] / pypol / linear.py

diff --git a/pypol/linear.py b/pypol/linear.py
index 621a157..eeee698 100644 (file)
--- a/pypol/linear.py
+++ b/pypol/linear.py
@@ -1,10 +1,12 @@
+import ast

 import functools
 import numbers
 import functools
 import numbers

+import re

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

-from pypol import isl
-from pypol.isl import libisl
+from . import isl
+from .isl import libisl

 
 
 __all__ = [
 
 
 __all__ = [


@@ -48,6 +50,13 @@ class Expression:
     This class implements linear expressions.
     """
 
     This class implements linear expressions.
     """
 

+    __slots__ = (
+        '_coefficients',
+        '_constant',
+        '_symbols',
+        '_dimension',
+    )
+

     def __new__(cls, coefficients=None, constant=0):
         if isinstance(coefficients, str):
             if constant:
     def __new__(cls, coefficients=None, constant=0):
         if isinstance(coefficients, str):
             if constant:


@@ -86,9 +95,36 @@ class Expression:
         self._dimension = len(self._symbols)
         return self
 
         self._dimension = len(self._symbols)
         return self
 

+    @classmethod
+    def _fromast(cls, node):
+        if isinstance(node, ast.Module) and len(node.body) == 1:
+            return cls._fromast(node.body[0])
+        elif isinstance(node, ast.Expr):
+            return cls._fromast(node.value)
+        elif isinstance(node, ast.Name):
+            return Symbol(node.id)
+        elif isinstance(node, ast.Num):
+            return Constant(node.n)
+        elif isinstance(node, ast.UnaryOp) and isinstance(node.op, ast.USub):
+            return -cls._fromast(node.operand)
+        elif isinstance(node, ast.BinOp):
+            left = cls._fromast(node.left)
+            right = cls._fromast(node.right)
+            if isinstance(node.op, ast.Add):
+                return left + right
+            elif isinstance(node.op, ast.Sub):
+                return left - right
+            elif isinstance(node.op, ast.Mult):
+                return left * right
+            elif isinstance(node.op, ast.Div):
+                return left / right
+        raise SyntaxError('invalid syntax')
+

     @classmethod
     def fromstring(cls, string):
     @classmethod
     def fromstring(cls, string):

-        raise NotImplementedError
+        string = re.sub(r'(\d+|\))\s*([^\W\d_]\w*|\()', r'\1*\2', string)
+        tree = ast.parse(string, 'eval')
+        return cls._fromast(tree)

 
     @property
     def symbols(self):
 
     @property
     def symbols(self):


@@ -319,11 +355,18 @@ class Constant(Expression):
         return bool(self.constant)
 
     def __repr__(self):
         return bool(self.constant)
 
     def __repr__(self):

-        return '{}({!r})'.format(self.__class__.__name__, self._constant)
-
+        if self.constant.denominator == 1:
+            return '{}({!r})'.format(self.__class__.__name__, self.constant)
+        else:
+            return '{}({!r}, {!r})'.format(self.__class__.__name__,
+                self.constant.numerator, self.constant.denominator)

 
 class Symbol(Expression):
 
 
 class Symbol(Expression):
 

+    __slots__ = Expression.__slots__ + (
+        '_name',
+    )
+

     def __new__(cls, name):
         if isinstance(name, Symbol):
             name = name.name
     def __new__(cls, name):
         if isinstance(name, Symbol):
             name = name.name


@@ -379,6 +422,13 @@ class Polyhedron:
     This class implements polyhedrons.
     """
 
     This class implements polyhedrons.
     """
 

+    __slots__ = (
+        '_equalities',
+        '_inequalities',
+        '_constraints',
+        '_symbols',
+    )
+

     def __new__(cls, equalities=None, inequalities=None):
         if isinstance(equalities, str):
             if inequalities is not None:
     def __new__(cls, equalities=None, inequalities=None):
         if isinstance(equalities, str):
             if inequalities is not None:


@@ -410,9 +460,54 @@ class Polyhedron:
         self._symbols = tuple(sorted(self._symbols))
         return self
 
         self._symbols = tuple(sorted(self._symbols))
         return self
 

+    @classmethod
+    def _fromast(cls, node):
+        if isinstance(node, ast.Module) and len(node.body) == 1:
+            return cls._fromast(node.body[0])
+        elif isinstance(node, ast.Expr):
+            return cls._fromast(node.value)
+        elif isinstance(node, ast.BinOp) and isinstance(node.op, ast.BitAnd):
+            equalities1, inequalities1 = cls._fromast(node.left)
+            equalities2, inequalities2 = cls._fromast(node.right)
+            equalities = equalities1 + equalities2
+            inequalities = inequalities1 + inequalities2
+            return equalities, inequalities
+        elif isinstance(node, ast.Compare):
+            equalities = []
+            inequalities = []
+            left = Expression._fromast(node.left)
+            for i in range(len(node.ops)):
+                op = node.ops[i]
+                right = Expression._fromast(node.comparators[i])
+                if isinstance(op, ast.Lt):
+                    inequalities.append(right - left - 1)
+                elif isinstance(op, ast.LtE):
+                    inequalities.append(right - left)
+                elif isinstance(op, ast.Eq):
+                    equalities.append(left - right)
+                elif isinstance(op, ast.GtE):
+                    inequalities.append(left - right)
+                elif isinstance(op, ast.Gt):
+                    inequalities.append(left - right - 1)
+                else:
+                    break
+                left = right
+            else:
+                return equalities, inequalities
+        raise SyntaxError('invalid syntax')
+

     @classmethod
     def fromstring(cls, string):
     @classmethod
     def fromstring(cls, string):

-        raise NotImplementedError
+        string = string.strip()
+        string = re.sub(r'^\{\s*|\s*\}$', '', string)
+        string = re.sub(r'([^<=>])=([^<=>])', r'\1==\2', string)
+        string = re.sub(r'(\d+|\))\s*([^\W\d_]\w*|\()', r'\1*\2', string)
+        tokens = re.split(r',|;|and|&&|/\\|∧', string, flags=re.I)
+        tokens = ['({})'.format(token) for token in tokens]
+        string = ' & '.join(tokens)
+        tree = ast.parse(string, 'eval')
+        equalities, inequalities = cls._fromast(tree)
+        return cls(equalities, inequalities)

 
     @property
     def equalities(self):
 
     @property
     def equalities(self):


@@ -524,7 +619,6 @@ class Polyhedron:
         difference = libisl.isl_set_subtract(bset, other)
         return difference
 
         difference = libisl.isl_set_subtract(bset, other)
         return difference
 

-

     def __sub__(self, other):
         return self.difference(other)
 
     def __sub__(self, other):
         return self.difference(other)
 


@@ -556,42 +650,39 @@ class Polyhedron:
     def _toisl(self, symbols=None):
         if symbols is None:
             symbols = self.symbols
     def _toisl(self, symbols=None):
         if symbols is None:
             symbols = self.symbols

-        num_coefficients = len(symbols)
-        space = libisl.isl_space_set_alloc(_main_ctx, 0, num_coefficients)
+        dimension = len(symbols)
+        space = libisl.isl_space_set_alloc(_main_ctx, 0, dimension)

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

-        #if there are equalities/inequalities, take each constant and coefficient and add as a constraint to the basic set
-        for eq in self.equalities:
+        for equality in self.equalities:

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

-            coeff_eq = dict(eq.coefficients())
-            if eq.constant:
-                value = str(eq.constant).encode()
-                val = libisl.isl_val_read_from_str(_main_ctx, value)
+            for symbol, coefficient in equality.coefficients():
+                val = str(coefficient).encode()
+                val = libisl.isl_val_read_from_str(_main_ctx, val)
+                dim = symbols.index(symbol)
+                ceq = libisl.isl_constraint_set_coefficient_val(ceq, libisl.isl_dim_set, dim, val)
+            if equality.constant != 0:
+                val = str(equality.constant).encode()
+                val = libisl.isl_val_read_from_str(_main_ctx, val)

                 ceq = libisl.isl_constraint_set_constant_val(ceq, val)
                 ceq = libisl.isl_constraint_set_constant_val(ceq, val)

-            for eq in coeff_eq:
-                number = str(coeff_eq.get(eq)).encode()
-                num = libisl.isl_val_read_from_str(_main_ctx, number)
-                iden = symbols.index(eq)
-                ceq = libisl.isl_constraint_set_coefficient_val(ceq, libisl.isl_dim_set, iden, num)  #use 3 for type isl_dim_set

             bset = libisl.isl_basic_set_add_constraint(bset, ceq)
             bset = libisl.isl_basic_set_add_constraint(bset, ceq)

-        for ineq in self.inequalities:
+        for inequality in self.inequalities:

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

-            coeff_in = dict(ineq.coefficients())
-            if ineq.constant:
-                value = str(ineq.constant).encode()
-                val = libisl.isl_val_read_from_str(_main_ctx, value)
+            for symbol, coefficient in inequality.coefficients():
+                val = str(coefficient).encode()
+                val = libisl.isl_val_read_from_str(_main_ctx, val)
+                dim = symbols.index(symbol)
+                cin = libisl.isl_constraint_set_coefficient_val(cin, libisl.isl_dim_set, dim, val)
+            if inequality.constant != 0:
+                val = str(inequality.constant).encode()
+                val = libisl.isl_val_read_from_str(_main_ctx, val)

                 cin = libisl.isl_constraint_set_constant_val(cin, val)
                 cin = libisl.isl_constraint_set_constant_val(cin, val)

-            for ineq in coeff_in:
-                number = str(coeff_in.get(ineq)).encode()
-                num = libisl.isl_val_read_from_str(_main_ctx, number)
-                iden = symbols.index(ineq)
-                cin = libisl.isl_constraint_set_coefficient_val(cin, libisl.isl_dim_set, iden, num)  #use 3 for type isl_dim_set

             bset = libisl.isl_basic_set_add_constraint(bset, cin)
         bset = isl.BasicSet(bset)
         return bset
 
     @classmethod
             bset = libisl.isl_basic_set_add_constraint(bset, cin)
         bset = isl.BasicSet(bset)
         return bset
 
     @classmethod

-    def _fromisl(cls, bset):
+    def _fromisl(cls, bset, symbols):

         raise NotImplementedError
         equalities = ...
         inequalities = ...
         raise NotImplementedError
         equalities = ...
         inequalities = ...


@@ -603,11 +694,13 @@ class Polyhedron:
             { [i0, i1] : 2i1 >= -2 - i0 } '''
 
 Empty = eq(0,1)
             { [i0, i1] : 2i1 >= -2 - i0 } '''
 
 Empty = eq(0,1)

+

 Universe = Polyhedron()
 
 Universe = Polyhedron()
 

+

 if __name__ == '__main__':
 if __name__ == '__main__':

-    ex1 = Expression(coefficients={'a': 6, 'b': 6}, constant= 3) #this is the expression that does not work (even without adding values)
-    ex2 = Expression(coefficients={'x': 4, 'y': 2}, constant= 3)
-    p = Polyhedron(equalities=[ex2])
-    p2 = Polyhedron(equalities=[ex2])
-    print(p._toisl()) # checking is values works for toisl
+    #p = Polyhedron('2a + 2b + 1 == 0') # empty
+    p = Polyhedron('3x + 2y + 3 == 0, y == 0') # not empty
+    ip = p._toisl()
+    print(ip)
+    print(ip.constraints())