X-Git-Url: https://scm.cri.ensmp.fr/git/linpy.git/blobdiff_plain/49b7b1b00f4cbbf5110ec77e72df004764f2b4bd..161d0ced692386a866e55aea673d991e2e95f753:/pypol/domains.py

diff --git a/pypol/domains.py b/pypol/domains.py
index be87ffb..224ac5f 100644
--- 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 .linexprs import Expression
+from .linexprs import Expression, Symbol
 
 
 __all__ = [
@@ -50,7 +50,7 @@ class Domain:
         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):
@@ -139,7 +139,7 @@ class Domain:
 
     def simplify(self):
         #does not change anything in any of the examples
-        #isl seems to do this naturally 
+        #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)
@@ -152,21 +152,21 @@ class Domain:
         islbset = libisl.isl_set_polyhedral_hull(islset)
         return Polyhedron._fromislbasicset(islbset, self.symbols)
 
-    def drop_dims(self, dims):
-        # use to remove certain variables use isl_set_drop_constraints_involving_dims instead?
-        from .polyhedra import Polyhedron      
-        dims = list(dims)
-        symbols = list(self.symbols)
+    def project_out(self, symbols):
+        # use to remove certain variables
         islset = self._toislset(self.polyhedra, self.symbols)
-        for dim in dims:
-            if dim in symbols:
-                first = symbols.index(dim)
-                islbset = libisl.isl_set_project_out(islset, libisl.isl_dim_set, first, 1)  
-                symbols.__delitem__(first)     
-            else:
-                islbset = libisl.isl_set_project_out(islset, libisl.isl_dim_set, 0, 0)        
-        return Polyhedron._fromislset(islbset, 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
         islset = self._toislset(self.polyhedra, self.symbols)
@@ -335,10 +335,26 @@ class Domain:
 
     @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):
-        raise NotImplementedError
+        import sympy
+        polyhedra = [polyhedron.tosympy() for polyhedron in polyhedra]
+        return sympy.Or(*polyhedra)
+
 
 def And(*domains):
     if len(domains) == 0: