index 1ffed45..fdb0ab0 100644 (file)
@@ -2,8 +2,9 @@ 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 .linexprs import Expression, Symbol

@@ -256,21 +257,36 @@ class Domain:
libisl.isl_set_free(islset)
return value

+    _RE_COORDINATE = re.compile(r'\((?P<num>\-?\d+)\)(/(?P<den>\d+))?')
+
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)
+        points = []
for vertex in vertices:
expr = libisl.isl_vertex_get_expr(vertex);
if islhelper.isl_version < '0.13':
string = islhelper.isl_set_to_str(expr)
+                print(string)
+                # to be continued...
else:
+                # horrible hack, find a cleaner solution
string = islhelper.isl_multi_aff_to_str(expr)
-            print(string)
+                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)
+        return points

def points(self):
if not self.isbounded():
-            raise ValueError('domain must be unbounded')
+            raise ValueError('domain must be bounded')
from .polyhedra import Universe, Eq
islset = self._toislset(self.polyhedra, self.symbols)
islpoints = islhelper.isl_set_points(islset)