X-Git-Url: https://scm.cri.ensmp.fr/git/linpy.git/blobdiff_plain/e21e06be0a63f74174e03a53037e91e051c84b79..ce985e833f88aed8957c73434198e6bac6bd234e:/pypol/domains.py

diff --git a/pypol/domains.py b/pypol/domains.py
index 600049c..375be85 100644
--- a/pypol/domains.py
+++ b/pypol/domains.py
@@ -265,15 +265,25 @@ class Domain:
         islbset = self._toislbasicset(self.equalities, self.inequalities, self.symbols)
         vertices = libisl.isl_basic_set_compute_vertices(islbset);
         vertices = islhelper.isl_vertices_vertices(vertices)
-        points = []
+        points = {}
+        num = 0
+        vertices_points = []
         for vertex in vertices:
-            expr = libisl.isl_vertex_get_expr(vertex); 
             if islhelper.isl_version < '0.13':
-                #pass bset from expr to points to get verticies
-                exp = Polyhedron._fromislbasicset(expr, self.symbols)
-                points.append(exp.points())
+                expr = libisl.isl_vertex_get_expr(vertex)
+                constraints = islhelper.isl_basic_set_constraints(expr) #get bset constraints
+                for index, dim in enumerate(self.symbols):
+                    for c in constraints: #for each constraint
+                        constant = libisl.isl_constraint_get_constant_val(c) #get constant value
+                        constant = islhelper.isl_val_to_int(constant)
+                        coefficient = libisl.isl_constraint_get_coefficient_val(c,libisl.isl_dim_set, index)
+                        coefficient = islhelper.isl_val_to_int(coefficient) #get coefficient
+                        if coefficient != 0:
+                            num = -Fraction(constant, coefficient)
+                            points[dim]= float(num)
+                vertices_points.append(points.copy())
             else:
-                # horrible hack, find a cleaner solution
+                points = []
                 string = islhelper.isl_multi_aff_to_str(expr)
                 matches = self._RE_COORDINATE.finditer(string)
                 point = {}
@@ -284,8 +294,8 @@ class Domain:
                     coordinate = Fraction(numerator, denominator)
                     point[symbol] = coordinate
                 points.append(point)
-        return points
-
+        return vertices_points
+    
     def points(self):
         if not self.isbounded():
             raise ValueError('domain must be bounded')