Cleaner and faster linear expressions

[linpy.git] / pypol / domains.py

diff --git a/pypol/domains.py b/pypol/domains.py
index 9bb403e..9187081 100644 (file)
--- a/pypol/domains.py
+++ b/pypol/domains.py
@@ -50,7 +50,7 @@ class Domain:
         symbols = set()
         for item in iterator:
             symbols.update(item.symbols)
         symbols = set()
         for item in iterator:
             symbols.update(item.symbols)

-        return tuple(sorted(symbols))
+        return tuple(sorted(symbols, key=lambda symbol: symbol.name))

 
     @property
     def polyhedra(self):
 
     @property
     def polyhedra(self):


@@ -138,10 +138,11 @@ class Domain:
         return self.complement()
 
     def simplify(self):
         return self.complement()
 
     def simplify(self):

-        # see isl_set_coalesce, isl_set_detect_equalities,
-        # isl_set_remove_redundancies
-        # which ones? in which order?
-        raise NotImplementedError
+        #does not change anything in any of the examples
+        #isl seems to do this naturally
+        islset = self._toislset(self.polyhedra, self.symbols)
+        islset = libisl.isl_set_remove_redundancies(islset)
+        return self._fromislset(islset, self.symbols)

 
     def polyhedral_hull(self):
         # several types of hull are available
 
     def polyhedral_hull(self):
         # several types of hull are available


@@ -151,10 +152,20 @@ class Domain:
         islbset = libisl.isl_set_polyhedral_hull(islset)
         return Polyhedron._fromislbasicset(islbset, self.symbols)
 
         islbset = libisl.isl_set_polyhedral_hull(islset)
         return Polyhedron._fromislbasicset(islbset, self.symbols)
 

-    def project(self, symbols):
-        # not sure what isl_set_project_out actually does…
-        # use isl_set_drop_constraints_involving_dims instead?
-        raise NotImplementedError
+    def project_out(self, symbols):
+        # 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:
+                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)

 
     def sample(self):
         from .polyhedra import Polyhedron
 
     def sample(self):
         from .polyhedra import Polyhedron


@@ -329,7 +340,6 @@ class Domain:
     def tosympy(self):
         raise NotImplementedError
 
     def tosympy(self):
         raise NotImplementedError
 

-

 def And(*domains):
     if len(domains) == 0:
         from .polyhedra import Universe
 def And(*domains):
     if len(domains) == 0:
         from .polyhedra import Universe