X-Git-Url: https://svn.cri.ensmp.fr/git/linpy.git/blobdiff_plain/5a8e09e71168fe25cf699991936fda5094086054..ce985e833f88aed8957c73434198e6bac6bd234e:/pypol/domains.py?ds=inline diff --git a/pypol/domains.py b/pypol/domains.py index f3f551a..375be85 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 @@ -144,7 +145,7 @@ class Domain: islset = libisl.isl_set_remove_redundancies(islset) return self._fromislset(islset, self.symbols) - def polyhedral_hull(self): + def aspolyhedron(self): # several types of hull are available # polyhedral seems to be the more appropriate, to be checked from .polyhedra import Polyhedron @@ -152,7 +153,7 @@ class Domain: islbset = libisl.isl_set_polyhedral_hull(islset) return Polyhedron._fromislbasicset(islbset, self.symbols) - def project_out(self, dims): + def project(self, dims): # use to remove certain variables islset = self._toislset(self.polyhedra, self.symbols) n = 0 @@ -168,10 +169,19 @@ class Domain: return Domain._fromislset(islset, dims) def sample(self): - from .polyhedra import Polyhedron islset = self._toislset(self.polyhedra, self.symbols) - islbset = libisl.isl_set_sample(islset) - return Polyhedron._fromislbasicset(islbset, self.symbols) + islpoint = libisl.isl_set_sample_point(islset) + if bool(libisl.isl_point_is_void(islpoint)): + libisl.isl_point_free(islpoint) + raise ValueError('domain must be non-empty') + point = {} + for index, symbol in enumerate(self.symbols): + coordinate = libisl.isl_point_get_coordinate_val(islpoint, + libisl.isl_dim_set, index) + coordinate = islhelper.isl_val_to_int(coordinate) + point[symbol] = coordinate + libisl.isl_point_free(islpoint) + return point def intersection(self, *others): if len(others) == 0: @@ -221,13 +231,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) @@ -238,45 +248,76 @@ 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 + _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 = {} + num = 0 + vertices_points = [] + for vertex in vertices: + if islhelper.isl_version < '0.13': + expr = libisl.isl_vertex_get_expr(vertex) + constraints = islhelper.isl_basic_set_constraints(expr) #get bset constraints + for index, dim in enumerate(self.symbols): + for c in constraints: #for each constraint + constant = libisl.isl_constraint_get_constant_val(c) #get constant value + constant = islhelper.isl_val_to_int(constant) + coefficient = libisl.isl_constraint_get_coefficient_val(c,libisl.isl_dim_set, index) + coefficient = islhelper.isl_val_to_int(coefficient) #get coefficient + if coefficient != 0: + num = -Fraction(constant, coefficient) + points[dim]= float(num) + vertices_points.append(points.copy()) + else: + points = [] + 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) + return vertices_points + def points(self): + if not self.isbounded(): + raise ValueError('domain must be bounded') + from .polyhedra import Universe, Eq + islset = self._toislset(self.polyhedra, self.symbols) + islpoints = islhelper.isl_set_points(islset) + points = [] + for islpoint in islpoints: + point = {} + for index, symbol in enumerate(self.symbols): + coordinate = libisl.isl_point_get_coordinate_val(islpoint, + libisl.isl_dim_set, index) + coordinate = islhelper.isl_val_to_int(coordinate) + point[symbol] = coordinate + points.append(point) + return points + + def subs(self, symbol, expression=None): + polyhedra = [polyhedron.subs(symbol, expression) + for polyhedron in self.polyhedra] + return Domain(*polyhedra) + @classmethod def _fromislset(cls, islset, symbols): from .polyhedra import Polyhedron @@ -299,6 +340,7 @@ class Domain: self._dimension = len(self._symbols) return self + @classmethod def _toislset(cls, polyhedra, symbols): polyhedron = polyhedra[0] islbset = polyhedron._toislbasicset(polyhedron.equalities,