X-Git-Url: https://scm.cri.ensmp.fr/git/linpy.git/blobdiff_plain/8fe086b5ae03df5fadf1ec7de1aa41c0ace4a3ae..eb2eadbbeeaf00d7e2af18e6c8ee47602f96e528:/pypol/domains.py diff --git a/pypol/domains.py b/pypol/domains.py index bbb0946..12cf471 100644 --- a/pypol/domains.py +++ b/pypol/domains.py @@ -155,24 +155,25 @@ class Domain: def drop_dims(self, dims): # use to remove certain variables use isl_set_drop_constraints_involving_dims instead? from .polyhedra import Polyhedron - n = 1 - dims = list(dims) - symbols = list(self.symbols) + n = 0 + dims = sorted(dims) + symbols = sorted(self.symbols) islset = self._toislset(self.polyhedra, self.symbols) for dim in dims: dim_index = dims.index(dim) if dim in symbols: first = symbols.index(dim) try: - if symbols[first+1] is dims[dim_index+1]: #check if next value in symbols is same as next value in dims - n += 1 - islbset = libisl.isl_set_project_out(islset, libisl.isl_dim_set, first, n) - symbols.__delitem__(first) + for dim in dims: + if symbols[first+1] is dims[dim_index+1]: #check if next value in symbols is same as next value in dims + n += 1 + islbset = libisl.isl_set_project_out(islset, libisl.isl_dim_set, first, n) + symbols.remove(dim) except: - islbset = libisl.isl_set_project_out(islset, libisl.isl_dim_set, first, n) - symbols.__delitem__(first) + islbset = libisl.isl_set_project_out(islset, libisl.isl_dim_set, first, 1) + symbols.remove(dim) else: - islbset = libisl.isl_set_project_out(islset, libisl.isl_dim_set, 0, 0) + islbset = libisl.isl_set_project_out(islset, libisl.isl_dim_set, 0, 0) return Polyhedron._fromislset(islbset, symbols) def sample(self):