X-Git-Url: https://svn.cri.ensmp.fr/git/linpy.git/blobdiff_plain/29ed88d1a15d283ea6f3340a4dd97e8cc7c2d2d4..5a8e09e71168fe25cf699991936fda5094086054:/pypol/domains.py?ds=inline diff --git a/pypol/domains.py b/pypol/domains.py index 9187081..f3f551a 100644 --- a/pypol/domains.py +++ b/pypol/domains.py @@ -5,7 +5,7 @@ import re from . import islhelper from .islhelper import mainctx, libisl, isl_set_basic_sets -from .linexprs import Expression +from .linexprs import Expression, Symbol __all__ = [ @@ -50,7 +50,7 @@ class Domain: symbols = set() for item in iterator: symbols.update(item.symbols) - return tuple(sorted(symbols, key=lambda symbol: symbol.name)) + return tuple(sorted(symbols, key=Symbol.sortkey)) @property def polyhedra(self): @@ -152,20 +152,20 @@ class Domain: islbset = libisl.isl_set_polyhedral_hull(islset) return Polyhedron._fromislbasicset(islbset, self.symbols) - def project_out(self, symbols): + def project_out(self, dims): # use to remove certain variables islset = self._toislset(self.polyhedra, self.symbols) n = 0 for index, symbol in reversed(list(enumerate(self.symbols))): - if symbol in symbols: + if symbol in dims: n += 1 elif n > 0: islset = libisl.isl_set_project_out(islset, libisl.isl_dim_set, index + 1, n) n = 0 if n > 0: islset = libisl.isl_set_project_out(islset, libisl.isl_dim_set, 0, n) - symbols = [symbol for symbol in self.symbols if symbol not in symbols] - return Domain._fromislset(islset, symbols) + dims = [symbol for symbol in self.symbols if symbol not in dims] + return Domain._fromislset(islset, dims) def sample(self): from .polyhedra import Polyhedron @@ -221,7 +221,62 @@ 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) + dims = sorted(dims) + symbols = sorted(list(self.symbols)) + n = 0 + if len(dims)>0: + for dim in dims: + if dim in symbols: + first = symbols.index(dims[0]) + n +=1 + else: + first = 0 + 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 @@ -335,10 +390,26 @@ class Domain: @classmethod def fromsympy(cls, expr): - raise NotImplementedError + import sympy + from .polyhedra import Lt, Le, Eq, Ne, Ge, Gt + funcmap = { + sympy.And: And, sympy.Or: Or, sympy.Not: Not, + sympy.Lt: Lt, sympy.Le: Le, + sympy.Eq: Eq, sympy.Ne: Ne, + sympy.Ge: Ge, sympy.Gt: Gt, + } + if expr.func in funcmap: + args = [Domain.fromsympy(arg) for arg in expr.args] + return funcmap[expr.func](*args) + elif isinstance(expr, sympy.Expr): + return Expression.fromsympy(expr) + raise ValueError('non-domain expression: {!r}'.format(expr)) def tosympy(self): - raise NotImplementedError + import sympy + polyhedra = [polyhedron.tosympy() for polyhedron in polyhedra] + return sympy.Or(*polyhedra) + def And(*domains): if len(domains) == 0: