Implementation of Symbol.sortkey()

[linpy.git] / pypol / domains.py

diff --git a/pypol/domains.py b/pypol/domains.py
index 6060dc9..224ac5f 100644 (file)
--- a/pypol/domains.py
+++ b/pypol/domains.py
@@ -5,7 +5,7 @@ import re
 from . import islhelper
 
 from .islhelper import mainctx, libisl, isl_set_basic_sets
 from . import islhelper
 
 from .islhelper import mainctx, libisl, isl_set_basic_sets

-from .linexprs import Expression, Symbol, symbolnames
+from .linexprs import Expression, Symbol

 
 
 __all__ = [
 
 
 __all__ = [


@@ -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):


@@ -154,13 +154,16 @@ class Domain:
 
     def project_out(self, symbols):
         # use to remove certain variables
 
     def project_out(self, symbols):
         # use to remove certain variables

-        symbols = symbolnames(symbols)

         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))):
             if symbol in 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
+                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)
 
         symbols = [symbol for symbol in self.symbols if symbol not in symbols]
         return Domain._fromislset(islset, symbols)
 


@@ -241,7 +244,6 @@ class Domain:
             self._dimension = len(self._symbols)
             return self
 
             self._dimension = len(self._symbols)
             return self
 

-    @classmethod

     def _toislset(cls, polyhedra, symbols):
         polyhedron = polyhedra[0]
         islbset = polyhedron._toislbasicset(polyhedron.equalities,
     def _toislset(cls, polyhedra, symbols):
         polyhedron = polyhedra[0]
         islbset = polyhedron._toislbasicset(polyhedron.equalities,


@@ -333,10 +335,25 @@ 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):
 
 
 def And(*domains):