X-Git-Url: https://scm.cri.mines-paristech.fr/git/linpy.git/blobdiff_plain/fb070deb31a82b789e1be4ffc5dfa64b4b7a9e36..9431c353bd39a1fbb855580ee34931a07321a0f1:/pypol/domains.py?ds=sidebyside

diff --git a/pypol/domains.py b/pypol/domains.py
index a2650e4..255c995 100644
--- a/pypol/domains.py
+++ b/pypol/domains.py
@@ -2,9 +2,11 @@ import ast
 import functools
 import re
 
-from . import islhelper
+from fractions import Fraction
 
+from . import islhelper
 from .islhelper import mainctx, libisl, isl_set_basic_sets
+from .coordinates import Point
 from .linexprs import Expression, Symbol
 
 
@@ -144,7 +146,7 @@ class Domain:
         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
@@ -152,7 +154,7 @@ class Domain:
         islbset = libisl.isl_set_polyhedral_hull(islset)
         return Polyhedron._fromislbasicset(islbset, self.symbols)
 
-    def project_out(self, dims):
+    def project(self, dims):
         # use to remove certain variables
         islset = self._toislset(self.polyhedra, self.symbols)
         n = 0
@@ -168,10 +170,19 @@ class Domain:
         return Domain._fromislset(islset, dims)
 
     def sample(self):
-        from .polyhedra import Polyhedron
         islset = self._toislset(self.polyhedra, self.symbols)
-        islbset = libisl.isl_set_sample(islset)
-        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:
@@ -221,13 +232,13 @@ class Domain:
         islset = self._toislset(self.polyhedra, self.symbols)
         islset = libisl.isl_set_lexmax(islset)
         return self._fromislset(islset, self.symbols)
-    
+
     def num_parameters(self):
         #could be useful with large, complicated polyhedrons
         islbset = self._toislbasicset(self.equalities, self.inequalities, self.symbols)
         num = libisl.isl_basic_set_dim(islbset, libisl.isl_dim_set)
         return num
-    
+
     def involves_dims(self, dims):
         #could be useful with large, complicated polyhedrons
         islset = self._toislset(self.polyhedra, self.symbols)
@@ -238,15 +249,80 @@ class Domain:
             for dim in dims:
                 if dim in symbols:
                     first = symbols.index(dims[0])
-                    n +=1  
+                    n +=1
                 else:
                     first = 0
-        else: 
-            return False            
+        else:
+            return False
         value = bool(libisl.isl_set_involves_dims(islset, libisl.isl_dim_set, first, n))
         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
@@ -269,6 +345,7 @@ class Domain:
             self._dimension = len(self._symbols)
             return self
 
+    @classmethod
     def _toislset(cls, polyhedra, symbols):
         polyhedron = polyhedra[0]
         islbset = polyhedron._toislbasicset(polyhedron.equalities,