From: Vivien Maisonneuve Date: Fri, 4 Jul 2014 18:40:22 +0000 (+0200) Subject: Reintroduce isl_basic_set_finalize to fix test cases X-Git-Tag: 1.0~146 X-Git-Url: https://scm.cri.ensmp.fr/git/linpy.git/commitdiff_plain/f933aea6fd6030396e0305dd169753a5d1c9b90e?hp=5a8e09e71168fe25cf699991936fda5094086054 Reintroduce isl_basic_set_finalize to fix test cases --- diff --git a/pypol/_islhelper.c b/pypol/_islhelper.c index 47ee1be..7751125 100644 --- a/pypol/_islhelper.c +++ b/pypol/_islhelper.c @@ -138,10 +138,8 @@ PyMODINIT_FUNC PyInit__islhelper(void) { if (m == NULL) { return NULL; } - if (PyModule_AddObject(m, "dim_set", PyLong_FromLong(isl_dim_set)) == -1) { return NULL; } - return m; } diff --git a/pypol/domains.py b/pypol/domains.py index f3f551a..05c9c8f 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,15 +240,15 @@ 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) @@ -276,7 +278,7 @@ class Domain: else: raise TypeError('set must be bounded') return coordinates - + @classmethod def _fromislset(cls, islset, symbols): from .polyhedra import Polyhedron