From: Vivien Maisonneuve Date: Sat, 5 Jul 2014 15:46:39 +0000 (+0200) Subject: Hacky way to get vertices with ISL 0.13 X-Git-Tag: 1.0~139 X-Git-Url: https://scm.cri.mines-paristech.fr/git/linpy.git/commitdiff_plain/9de8ee74599e94260da37ce8349ac04cc3ae89c3?ds=inline;hp=ef94baf60054758dcea30bc444d0002fec2da361 Hacky way to get vertices with ISL 0.13 --- diff --git a/pypol/domains.py b/pypol/domains.py index 1ffed45..fdb0ab0 100644 --- a/pypol/domains.py +++ b/pypol/domains.py @@ -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\-?\d+)\)(/(?P\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)