Minor refactoring of Domain.points()

[linpy.git] / pypol / domains.py

diff --git a/pypol/domains.py b/pypol/domains.py
index 6b47fe8..a924b83 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=Symbol.sortkey))

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


@@ -152,30 +152,27 @@ 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_out(self, symbols):
+    def project_out(self, dims):

         # use to remove certain variables
         # use to remove certain variables

-        if isinstance(symbols, str):
-            symbols = symbols.replace(',', ' ').split()
-        else:
-            symbols = list(symbols)
-            for i, symbol in enumerate(symbols):
-                if isinstance(symbol, Symbol):
-                    symbols[i] = symbol.name
-                elif not isinstance(symbol, str):
-                    raise TypeError('symbols must be strings or Symbol instances')

         islset = self._toislset(self.polyhedra, self.symbols)
         islset = self._toislset(self.polyhedra, self.symbols)

-        # the trick is to walk symbols in reverse order, to avoid index updates
+        n = 0

         for index, symbol in reversed(list(enumerate(self.symbols))):
         for index, symbol in reversed(list(enumerate(self.symbols))):

-            if symbol in symbols:
-                islset = libisl.isl_set_project_out(islset, libisl.isl_dim_set, index, 1)
-        # remaining symbols
-        symbols = [symbol for symbol in self.symbols if symbol not in symbols]
-        return Domain._fromislset(islset, symbols)
+            if symbol in dims:
+                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)
+        dims = [symbol for symbol in self.symbols if symbol not in dims]
+        return Domain._fromislset(islset, dims)

 
     def sample(self):
         from .polyhedra import Polyhedron
         islset = self._toislset(self.polyhedra, self.symbols)
         islbset = libisl.isl_set_sample(islset)
 
     def sample(self):
         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):
         return Polyhedron._fromislbasicset(islbset, self.symbols)
 
     def intersection(self, *others):


@@ -227,6 +224,60 @@ class Domain:
         islset = libisl.isl_set_lexmax(islset)
         return self._fromislset(islset, 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)
+        dims = sorted(dims)
+        symbols = sorted(list(self.symbols))
+        n = 0
+        if len(dims)>0:
+            for dim in dims:
+                if dim in symbols:
+                    first = symbols.index(dims[0])
+                    n +=1
+                else:
+                    first = 0
+        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):
+        islbset = self._toislbasicset(self.equalities, self.inequalities, self.symbols)
+        vertices = libisl.isl_basic_set_compute_vertices(islbset);
+        vertices = islhelper.isl_vertices_vertices(vertices)
+        for vertex in vertices:
+            expr = libisl.isl_vertex_get_expr(vertex);
+            if islhelper.isl_version < '0.13':
+                string = islhelper.isl_set_to_str(expr)
+            else:
+                string = islhelper.isl_multi_aff_to_str(expr)
+            print(string)
+
+    def points(self):
+        if not self.isbounded():
+            raise ValueError('domain must be unbounded')
+        from .polyhedra import Universe, Eq
+        islset = self._toislset(self.polyhedra, self.symbols)
+        islpoints = islhelper.isl_set_points(islset)
+        points = []
+        for islpoint in islpoints:
+            point = {}
+            for index, symbol in enumerate(self.symbols):
+                coordinate = libisl.isl_point_get_coordinate_val(islpoint,
+                    libisl.isl_dim_set, index)
+                coordinate = islhelper.isl_val_to_int(coordinate)
+                point[symbol] = coordinate
+            points.append(point)
+        return points
+

     @classmethod
     def _fromislset(cls, islset, symbols):
         from .polyhedra import Polyhedron
     @classmethod
     def _fromislset(cls, islset, symbols):
         from .polyhedra import Polyhedron


@@ -340,10 +391,26 @@ class Domain:
 
     @classmethod
     def fromsympy(cls, expr):
 
     @classmethod
     def fromsympy(cls, expr):

-        raise NotImplementedError
+        import sympy
+        from .polyhedra import Lt, Le, Eq, Ne, Ge, Gt
+        funcmap = {
+            sympy.And: And, sympy.Or: Or, sympy.Not: Not,
+            sympy.Lt: Lt, sympy.Le: Le,
+            sympy.Eq: Eq, sympy.Ne: Ne,
+            sympy.Ge: Ge, sympy.Gt: Gt,
+        }
+        if expr.func in funcmap:
+            args = [Domain.fromsympy(arg) for arg in expr.args]
+            return funcmap[expr.func](*args)
+        elif isinstance(expr, sympy.Expr):
+            return Expression.fromsympy(expr)
+        raise ValueError('non-domain expression: {!r}'.format(expr))

 
     def tosympy(self):
 
     def tosympy(self):

-        raise NotImplementedError
+        import sympy
+        polyhedra = [polyhedron.tosympy() for polyhedron in polyhedra]
+        return sympy.Or(*polyhedra)
+

 
 def And(*domains):
     if len(domains) == 0:
 
 def And(*domains):
     if len(domains) == 0: