X-Git-Url: https://svn.cri.ensmp.fr/git/linpy.git/blobdiff_plain/e21e06be0a63f74174e03a53037e91e051c84b79..0995f79a8db531aa3a2ca951af65f3f0fa4943e5:/pypol/domains.py?ds=sidebyside

diff --git a/pypol/domains.py b/pypol/domains.py
index 600049c..3ab7d44 100644
--- a/pypol/domains.py
+++ b/pypol/domains.py
@@ -6,6 +6,7 @@ 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
 
 
@@ -267,23 +268,31 @@ class Domain:
         vertices = islhelper.isl_vertices_vertices(vertices)
         points = []
         for vertex in vertices:
-            expr = libisl.isl_vertex_get_expr(vertex); 
+            expr = libisl.isl_vertex_get_expr(vertex)
+            coordinates = []
             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())
+                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)
-                point = {}
                 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)
-                    point[symbol] = coordinate
-                points.append(point)
+                    coordinates.append((symbol, coordinate))
+            points.append(Point(coordinates))
         return points
 
     def points(self):
@@ -294,13 +303,13 @@ class Domain:
         islpoints = islhelper.isl_set_points(islset)
         points = []
         for islpoint in islpoints:
-            point = {}
+            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)
-                point[symbol] = coordinate
-            points.append(point)
+                coordinates[symbol] = coordinate
+            points.append(Point(coordinates))
         return points
 
     def subs(self, symbol, expression=None):