Drop_dims working for any order!
authorDanielle Bolan <n02702451@hawkmail.newpaltz.edu>
Wed, 2 Jul 2014 10:01:03 +0000 (12:01 +0200)
committerDanielle Bolan <n02702451@hawkmail.newpaltz.edu>
Wed, 2 Jul 2014 10:01:03 +0000 (12:01 +0200)
pypol/domains.py

index 3bcfa24..12cf471 100644 (file)
@@ -156,8 +156,8 @@ class Domain:
         # use to remove certain variables use isl_set_drop_constraints_involving_dims instead?
         from .polyhedra import Polyhedron 
         n = 0 
         # use to remove certain variables use isl_set_drop_constraints_involving_dims instead?
         from .polyhedra import Polyhedron 
         n = 0 
-        dims = list(dims)
-        symbols = list(self.symbols)
+        dims = sorted(dims)
+        symbols = sorted(self.symbols)
         islset = self._toislset(self.polyhedra, self.symbols)
         for dim in dims:
             dim_index = dims.index(dim)
         islset = self._toislset(self.polyhedra, self.symbols)
         for dim in dims:
             dim_index = dims.index(dim)
@@ -170,10 +170,10 @@ class Domain:
                         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.remove(dim)
                 except:
-                    islbset = libisl.isl_set_project_out(islset, libisl.isl_dim_set, first, 1)  
-                    symbols.__delitem__(first)     
+                    islbset = libisl.isl_set_project_out(islset, libisl.isl_dim_set, first, 1) 
+                    symbols.remove(dim) 
             else:
             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):
         return Polyhedron._fromislset(islbset, symbols)
     
     def sample(self):