Add methods may be useful for larger polys, change format of printing

[linpy.git] / pypol / tests / test_polyhedra.py

diff --git a/pypol/tests/test_polyhedra.py b/pypol/tests/test_polyhedra.py
index cb2015f..7b8e033 100644 (file)
--- a/pypol/tests/test_polyhedra.py
+++ b/pypol/tests/test_polyhedra.py
@@ -20,11 +20,11 @@ class TestPolyhedron(unittest.TestCase):
 
     def test_str(self):
         self.assertEqual(str(self.square),
 
     def test_str(self):
         self.assertEqual(str(self.square),

-            'And(Ge(x, 0), Ge(-x + 1, 0), Ge(y, 0), Ge(-y + 1, 0))')
+            'And(0 <= x, 0 <= -x + 1, 0 <= y, 0 <= -y + 1)')

 
     def test_repr(self):
         self.assertEqual(repr(self.square),
 
     def test_repr(self):
         self.assertEqual(repr(self.square),

-            "And(Ge(x, 0), Ge(-x + 1, 0), Ge(y, 0), Ge(-y + 1, 0))")
+            "And(0 <= x, 0 <= -x + 1, 0 <= y, 0 <= -y + 1)")

 
     def test_fromstring(self):
         self.assertEqual(Polyhedron.fromstring('{x >= 0, -x + 1 >= 0, '
 
     def test_fromstring(self):
         self.assertEqual(Polyhedron.fromstring('{x >= 0, -x + 1 >= 0, '