X-Git-Url: https://svn.cri.ensmp.fr/git/linpy.git/blobdiff_plain/fb070deb31a82b789e1be4ffc5dfa64b4b7a9e36..8c9a4d4d0ecef68ff3cd0f7806a69013d34a2013:/pypol/domains.py?ds=inline

diff --git a/pypol/domains.py b/pypol/domains.py
index a2650e4..632335b 100644
--- a/pypol/domains.py
+++ b/pypol/domains.py
@@ -144,7 +144,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 +152,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
@@ -171,6 +171,8 @@ class Domain:
         from .polyhedra import Polyhedron
         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)
 
     def intersection(self, *others):
@@ -221,13 +223,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 +240,44 @@ 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
 
+    def vertices(self):
+        islbset = self._toislbasicset(self.equalities, self.inequalities, self.symbols)
+        vertices = libisl.isl_basic_set_compute_vertices(islbset);
+        vertices = islhelper.isl_vertices_vertices(vertices)
+        for vertex in vertices:
+            expr = libisl.isl_vertex_get_expr(vertex);
+            if islhelper.isl_version < '0.13':
+                string = islhelper.isl_set_to_str(expr)
+            else:
+                string = islhelper.isl_multi_aff_to_str(expr)
+            print(string)
+
+    def points(self):
+        if not self.isbounded():
+            raise ValueError('domain must be unbounded')
+        from .polyhedra import Universe, Eq
+        islset = self._toislset(self.polyhedra, self.symbols)
+        islpoints = islhelper.isl_set_points(islset)
+        points = []
+        for islpoint in islpoints:
+            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
+            points.append(point)
+        return points
+
     @classmethod
     def _fromislset(cls, islset, symbols):
         from .polyhedra import Polyhedron