From: Danielle Bolan Date: Fri, 4 Jul 2014 15:43:46 +0000 (+0200) Subject: Add vertices and points, messy! X-Git-Tag: 1.0~147 X-Git-Url: https://scm.cri.mines-paristech.fr/git/linpy.git/commitdiff_plain/5a8e09e71168fe25cf699991936fda5094086054?ds=inline Add vertices and points, messy! --- diff --git a/pypol/domains.py b/pypol/domains.py index 3034764..f3f551a 100644 --- a/pypol/domains.py +++ b/pypol/domains.py @@ -171,8 +171,6 @@ class Domain: from .polyhedra import Polyhedron islset = self._toislset(self.polyhedra, self.symbols) islbset = libisl.isl_set_sample(islset) - # next instruction should NOT be required - islbset = libisl.isl_basic_set_finalize(islbset) return Polyhedron._fromislbasicset(islbset, self.symbols) def intersection(self, *others): @@ -223,13 +221,13 @@ class Domain: islset = self._toislset(self.polyhedra, self.symbols) islset = libisl.isl_set_lexmax(islset) return self._fromislset(islset, self.symbols) - + def num_parameters(self): #could be useful with large, complicated polyhedrons islbset = self._toislbasicset(self.equalities, self.inequalities, self.symbols) num = libisl.isl_basic_set_dim(islbset, libisl.isl_dim_set) return num - + def involves_dims(self, dims): #could be useful with large, complicated polyhedrons islset = self._toislset(self.polyhedra, self.symbols) @@ -240,15 +238,45 @@ class Domain: for dim in dims: if dim in symbols: first = symbols.index(dims[0]) - n +=1 + n +=1 else: first = 0 - else: - return False + else: + return False value = bool(libisl.isl_set_involves_dims(islset, libisl.isl_dim_set, first, n)) libisl.isl_set_free(islset) return value - + + def vertices(self): + if self.isbounded(): + islbset = self._toislbasicset(self.equalities, self.inequalities, self.symbols) + vertices = libisl.isl_basic_set_compute_vertices(islbset); + vertexes = islhelper.isl_vertices_vertices(vertices) + #vertex = libisl.isl_vertices_get_n_vertices(vertices) + for verts in vertexes: + expr = libisl.isl_vertex_get_expr(verts); + this = islhelper.isl_set_to_str(expr) + print(this) + else: + raise TypeError('set must be bounded') + return string + + def points(self): + bounds = {} + coordinates = [] + symbols = self.symbols + if self.isbounded(): + islset = self._toislset(self.polyhedra, self.symbols) + points = islhelper.isl_set_points(islset) + for sym in symbols: + for point in points: + coordinate = libisl.isl_point_get_coordinate_val(point, libisl.isl_dim_set, symbols.index(sym)) + coordinate = islhelper.isl_val_to_int(coordinate) + coordinates.append(coordinate) + else: + raise TypeError('set must be bounded') + return coordinates + @classmethod def _fromislset(cls, islset, symbols): from .polyhedra import Polyhedron