X-Git-Url: https://svn.cri.ensmp.fr/git/linpy.git/blobdiff_plain/e21e06be0a63f74174e03a53037e91e051c84b79..dba7d8fa774455d02d3cd3e0ab740fa9a727e4bb:/pypol/domains.py diff --git a/pypol/domains.py b/pypol/domains.py index 600049c..45040c8 100644 --- a/pypol/domains.py +++ b/pypol/domains.py @@ -267,23 +267,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) + point = {} 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) + 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):