Implementation of Symbol.sortkey()

[linpy.git] / pypol / polyhedra.py

diff --git a/pypol/polyhedra.py b/pypol/polyhedra.py
index fa2a5c6..6b44bdc 100644 (file)
--- a/pypol/polyhedra.py
+++ b/pypol/polyhedra.py
@@ -172,38 +172,12 @@ class Polyhedron(Domain):
             else:
                 return 'And({})'.format(', '.join(strings))
 
             else:
                 return 'And({})'.format(', '.join(strings))
 

-    @classmethod
-    def _fromsympy(cls, expr):
-        import sympy
-        equalities = []
-        inequalities = []
-        if expr.func == sympy.And:
-            for arg in expr.args:
-                arg_eqs, arg_ins = cls._fromsympy(arg)
-                equalities.extend(arg_eqs)
-                inequalities.extend(arg_ins)
-        elif expr.func == sympy.Eq:
-            expr = Expression.fromsympy(expr.args[0] - expr.args[1])
-            equalities.append(expr)
-        else:
-            if expr.func == sympy.Lt:
-                expr = Expression.fromsympy(expr.args[1] - expr.args[0] - 1)
-            elif expr.func == sympy.Le:
-                expr = Expression.fromsympy(expr.args[1] - expr.args[0])
-            elif expr.func == sympy.Ge:
-                expr = Expression.fromsympy(expr.args[0] - expr.args[1])
-            elif expr.func == sympy.Gt:
-                expr = Expression.fromsympy(expr.args[0] - expr.args[1] - 1)
-            else:
-                raise ValueError('non-polyhedral expression: {!r}'.format(expr))
-            inequalities.append(expr)
-        return equalities, inequalities
-

     @classmethod
     def fromsympy(cls, expr):
     @classmethod
     def fromsympy(cls, expr):

-        import sympy
-        equalities, inequalities = cls._fromsympy(expr)
-        return cls(equalities, inequalities)
+        domain = Domain.fromsympy(expr)
+        if not isinstance(domain, Polyhedron):
+            raise ValueError('non-polyhedral expression: {!r}'.format(expr))
+        return domain

 
     def tosympy(self):
         import sympy
 
     def tosympy(self):
         import sympy