Rename Domain.polyhedral_hull() into Domain.aspolyhedron()

[linpy.git] / pypol / polyhedra.py

diff --git a/pypol/polyhedra.py b/pypol/polyhedra.py
index fa2a5c6..a6adeda 100644 (file)
--- a/pypol/polyhedra.py
+++ b/pypol/polyhedra.py
@@ -37,7 +37,7 @@ class Polyhedron(Domain):
         elif isinstance(equalities, Domain):
             if inequalities is not None:
                 raise TypeError('too many arguments')
         elif isinstance(equalities, Domain):
             if inequalities is not None:
                 raise TypeError('too many arguments')

-            return equalities.polyhedral_hull()
+            return equalities.aspolyhedron()

         if equalities is None:
             equalities = []
         else:
         if equalities is None:
             equalities = []
         else:


@@ -82,7 +82,7 @@ class Polyhedron(Domain):
         libisl.isl_basic_set_free(islbset)
         return universe
 
         libisl.isl_basic_set_free(islbset)
         return universe
 

-    def polyhedral_hull(self):
+    def aspolyhedron(self):

         return self
 
     @classmethod
         return self
 
     @classmethod


@@ -164,46 +164,20 @@ class Polyhedron(Domain):
         else:
             strings = []
             for equality in self.equalities:
         else:
             strings = []
             for equality in self.equalities:

-                strings.append('Eq({}, 0)'.format(equality))
+                strings.append('0 == {}'.format(equality))

             for inequality in self.inequalities:
             for inequality in self.inequalities:

-                strings.append('Ge({}, 0)'.format(inequality))
+                strings.append('0 <= {}'.format(inequality))

             if len(strings) == 1:
                 return strings[0]
             else:
                 return 'And({})'.format(', '.join(strings))
 
             if len(strings) == 1:
                 return strings[0]
             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