X-Git-Url: https://scm.cri.ensmp.fr/git/linpy.git/blobdiff_plain/17f12d8f63d696f09dbb44be3dc24b9aba7b88d3..dba7d8fa774455d02d3cd3e0ab740fa9a727e4bb:/pypol/domains.py diff --git a/pypol/domains.py b/pypol/domains.py index 2fbd544..45040c8 100644 --- a/pypol/domains.py +++ b/pypol/domains.py @@ -260,28 +260,38 @@ class Domain: _RE_COORDINATE = re.compile(r'\((?P\-?\d+)\)(/(?P\d+))?') def vertices(self): + #returning list of verticies + from .polyhedra import Polyhedron 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); + expr = libisl.isl_vertex_get_expr(vertex) + point = {} if islhelper.isl_version < '0.13': - string = islhelper.isl_set_to_str(expr) - print(string) - # to be continued... + 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) + point[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) + points.append(point) return points def points(self):