Simplify Expression.__mul__(), Expression.__truediv__()

[linpy.git] / pypol / domains.py

diff --git a/pypol/domains.py b/pypol/domains.py
index 3034764..10d12c5 100644 (file)
--- a/pypol/domains.py
+++ b/pypol/domains.py
@@ -2,9 +2,11 @@ import ast
 import functools
 import re
 
 import functools
 import re
 

-from . import islhelper
+from fractions import Fraction

 
 

-from .islhelper import mainctx, libisl, isl_set_basic_sets
+from . import islhelper
+from .islhelper import mainctx, libisl
+from .geometry import GeometricObject, Point

 from .linexprs import Expression, Symbol
 
 
 from .linexprs import Expression, Symbol
 
 


@@ -15,7 +17,7 @@ __all__ = [
 
 
 @functools.total_ordering
 
 
 @functools.total_ordering

-class Domain:
+class Domain(GeometricObject):

 
     __slots__ = (
         '_polyhedra',
 
     __slots__ = (
         '_polyhedra',


@@ -26,14 +28,14 @@ class Domain:
     def __new__(cls, *polyhedra):
         from .polyhedra import Polyhedron
         if len(polyhedra) == 1:
     def __new__(cls, *polyhedra):
         from .polyhedra import Polyhedron
         if len(polyhedra) == 1:

-            polyhedron = polyhedra[0]
-            if isinstance(polyhedron, str):
-                return cls.fromstring(polyhedron)
-            elif isinstance(polyhedron, Polyhedron):
-                return polyhedron
+            argument = polyhedra[0]
+            if isinstance(argument, str):
+                return cls.fromstring(argument)
+            elif isinstance(argument, GeometricObject):
+                return argument.aspolyhedron()

             else:
                 raise TypeError('argument must be a string '
             else:
                 raise TypeError('argument must be a string '

-                    'or a Polyhedron instance')
+                    'or a GeometricObject instance')

         else:
             for polyhedron in polyhedra:
                 if not isinstance(polyhedron, Polyhedron):
         else:
             for polyhedron in polyhedra:
                 if not isinstance(polyhedron, Polyhedron):


@@ -144,7 +146,7 @@ class Domain:
         islset = libisl.isl_set_remove_redundancies(islset)
         return self._fromislset(islset, self.symbols)
 
         islset = libisl.isl_set_remove_redundancies(islset)
         return self._fromislset(islset, self.symbols)
 

-    def polyhedral_hull(self):
+    def aspolyhedron(self):

         # several types of hull are available
         # polyhedral seems to be the more appropriate, to be checked
         from .polyhedra import Polyhedron
         # several types of hull are available
         # polyhedral seems to be the more appropriate, to be checked
         from .polyhedra import Polyhedron


@@ -152,7 +154,10 @@ class Domain:
         islbset = libisl.isl_set_polyhedral_hull(islset)
         return Polyhedron._fromislbasicset(islbset, self.symbols)
 
         islbset = libisl.isl_set_polyhedral_hull(islset)
         return Polyhedron._fromislbasicset(islbset, self.symbols)
 

-    def project_out(self, dims):
+    def asdomain(self):
+        return self
+
+    def project(self, dims):

         # use to remove certain variables
         islset = self._toislset(self.polyhedra, self.symbols)
         n = 0
         # use to remove certain variables
         islset = self._toislset(self.polyhedra, self.symbols)
         n = 0


@@ -168,12 +173,19 @@ class Domain:
         return Domain._fromislset(islset, dims)
 
     def sample(self):
         return Domain._fromislset(islset, dims)
 
     def sample(self):

-        from .polyhedra import Polyhedron

         islset = self._toislset(self.polyhedra, self.symbols)
         islset = self._toislset(self.polyhedra, self.symbols)

-        islbset = libisl.isl_set_sample(islset)
-        # next instruction should NOT be required
-        islbset = libisl.isl_basic_set_finalize(islbset)
-        return Polyhedron._fromislbasicset(islbset, self.symbols)
+        islpoint = libisl.isl_set_sample_point(islset)
+        if bool(libisl.isl_point_is_void(islpoint)):
+            libisl.isl_point_free(islpoint)
+            raise ValueError('domain must be non-empty')
+        point = {}
+        for index, symbol in enumerate(self.symbols):
+            coordinate = libisl.isl_point_get_coordinate_val(islpoint,
+                libisl.isl_dim_set, index)
+            coordinate = islhelper.isl_val_to_int(coordinate)
+            point[symbol] = coordinate
+        libisl.isl_point_free(islpoint)
+        return point

 
     def intersection(self, *others):
         if len(others) == 0:
 
     def intersection(self, *others):
         if len(others) == 0:


@@ -249,11 +261,76 @@ class Domain:
         libisl.isl_set_free(islset)
         return value
 
         libisl.isl_set_free(islset)
         return value
 

+    _RE_COORDINATE = re.compile(r'\((?P<num>\-?\d+)\)(/(?P<den>\d+))?')
+
+    def vertices(self):
+        #returning list of verticies
+        from .polyhedra import Polyhedron
+        islbset = self._toislbasicset(self.equalities, self.inequalities, self.symbols)
+        vertices = libisl.isl_basic_set_compute_vertices(islbset);
+        vertices = islhelper.isl_vertices_vertices(vertices)
+        points = []
+        for vertex in vertices:
+            expr = libisl.isl_vertex_get_expr(vertex)
+            coordinates = []
+            if islhelper.isl_version < '0.13':
+                constraints = islhelper.isl_basic_set_constraints(expr)
+                for constraint in constraints:
+                    constant = libisl.isl_constraint_get_constant_val(constraint)
+                    constant = islhelper.isl_val_to_int(constant)
+                    for index, symbol in enumerate(self.symbols):
+                        coefficient = libisl.isl_constraint_get_coefficient_val(constraint,
+                            libisl.isl_dim_set, index)
+                        coefficient = islhelper.isl_val_to_int(coefficient)
+                        if coefficient != 0:
+                            coordinate = -Fraction(constant, coefficient)
+                            coordinates.append((symbol, coordinate))
+            else:
+                # horrible hack, find a cleaner solution
+                string = islhelper.isl_multi_aff_to_str(expr)
+                matches = self._RE_COORDINATE.finditer(string)
+                for symbol, match in zip(self.symbols, matches):
+                    numerator = int(match.group('num'))
+                    denominator = match.group('den')
+                    denominator = 1 if denominator is None else int(denominator)
+                    coordinate = Fraction(numerator, denominator)
+                    coordinates.append((symbol, coordinate))
+            points.append(Point(coordinates))
+        return points
+
+    def points(self):
+        if not self.isbounded():
+            raise ValueError('domain must be bounded')
+        from .polyhedra import Universe, Eq
+        islset = self._toislset(self.polyhedra, self.symbols)
+        islpoints = islhelper.isl_set_points(islset)
+        points = []
+        for islpoint in islpoints:
+            coordinates = {}
+            for index, symbol in enumerate(self.symbols):
+                coordinate = libisl.isl_point_get_coordinate_val(islpoint,
+                    libisl.isl_dim_set, index)
+                coordinate = islhelper.isl_val_to_int(coordinate)
+                coordinates[symbol] = coordinate
+            points.append(Point(coordinates))
+        return points
+
+    def __contains__(self, point):
+        for polyhedron in self.polyhedra:
+            if point in polyhedron:
+                return True
+        return False
+
+    def subs(self, symbol, expression=None):
+        polyhedra = [polyhedron.subs(symbol, expression)
+            for polyhedron in self.polyhedra]
+        return Domain(*polyhedra)
+

     @classmethod
     def _fromislset(cls, islset, symbols):
         from .polyhedra import Polyhedron
         islset = libisl.isl_set_remove_divs(islset)
     @classmethod
     def _fromislset(cls, islset, symbols):
         from .polyhedra import Polyhedron
         islset = libisl.isl_set_remove_divs(islset)

-        islbsets = isl_set_basic_sets(islset)
+        islbsets = islhelper.isl_set_basic_sets(islset)

         libisl.isl_set_free(islset)
         polyhedra = []
         for islbset in islbsets:
         libisl.isl_set_free(islset)
         polyhedra = []
         for islbset in islbsets:


@@ -271,6 +348,7 @@ class Domain:
             self._dimension = len(self._symbols)
             return self
 
             self._dimension = len(self._symbols)
             return self
 

+    @classmethod

     def _toislset(cls, polyhedra, symbols):
         polyhedron = polyhedra[0]
         islbset = polyhedron._toislbasicset(polyhedron.equalities,
     def _toislset(cls, polyhedra, symbols):
         polyhedron = polyhedra[0]
         islbset = polyhedron._toislbasicset(polyhedron.equalities,


@@ -360,6 +438,12 @@ class Domain:
         strings = [repr(polyhedron) for polyhedron in self.polyhedra]
         return 'Or({})'.format(', '.join(strings))
 
         strings = [repr(polyhedron) for polyhedron in self.polyhedra]
         return 'Or({})'.format(', '.join(strings))
 

+    def _repr_latex_(self):
+        strings = []
+        for polyhedron in self.polyhedra:
+            strings.append('({})'.format(polyhedron._repr_latex_().strip('$')))
+        return '${}$'.format(' \\vee '.join(strings))
+

     @classmethod
     def fromsympy(cls, expr):
         import sympy
     @classmethod
     def fromsympy(cls, expr):
         import sympy