From: Vivien Maisonneuve Date: Fri, 4 Jul 2014 09:09:30 +0000 (+0200) Subject: Move isl_basic_set_finalize from C code to Python X-Git-Tag: 1.0~150 X-Git-Url: https://scm.cri.mines-paristech.fr/git/linpy.git/commitdiff_plain/2c6add2e9a2fbc48a6421ecd22f2f7fa9cbb15a0?ds=sidebyside Move isl_basic_set_finalize from C code to Python --- diff --git a/pypol/_islhelper.c b/pypol/_islhelper.c index 37e7c31..7e2408e 100644 --- a/pypol/_islhelper.c +++ b/pypol/_islhelper.c @@ -36,7 +36,6 @@ static PyObject * isl_basic_set_constraints(PyObject *self, PyObject* args) { return NULL; } bset = (isl_basic_set *) ptr; - bset = isl_basic_set_finalize(bset); // this instruction should not be required n = isl_basic_set_n_constraint(bset); if (n == -1) { PyErr_SetString(PyExc_RuntimeError, diff --git a/pypol/domains.py b/pypol/domains.py index a2650e4..3034764 100644 --- a/pypol/domains.py +++ b/pypol/domains.py @@ -171,6 +171,8 @@ 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): @@ -221,13 +223,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,11 +240,11 @@ 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