Minor improvements in testing of new expressions

[linpy.git] / pypol / polyhedra.py

diff --git a/pypol/polyhedra.py b/pypol/polyhedra.py
index 6b44bdc..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,9 +164,9 @@ 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:
             if len(strings) == 1:
                 return strings[0]
             else: