Fix error message

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

diff --git a/linpy/tests/test_polyhedra.py b/linpy/tests/test_polyhedra.py
index d50f0f1..60e1b33 100644 (file)
--- a/linpy/tests/test_polyhedra.py
+++ b/linpy/tests/test_polyhedra.py
@@ -15,11 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with LinPy.  If not, see <http://www.gnu.org/licenses/>.
 
 # You should have received a copy of the GNU General Public License
 # along with LinPy.  If not, see <http://www.gnu.org/licenses/>.
 

-import functools

 import unittest
 
 from ..linexprs import symbols
 import unittest
 
 from ..linexprs import symbols

-from ..polyhedra import *
+from ..polyhedra import Empty, Polyhedron, Universe

 from .libhelper import requires_sympy
 
 
 from .libhelper import requires_sympy
 
 


@@ -35,17 +34,15 @@ class TestPolyhedron(unittest.TestCase):
     def test_dimension(self):
         self.assertEqual(self.square.dimension, 2)
 
     def test_dimension(self):
         self.assertEqual(self.square.dimension, 2)
 

-    def test_str(self):
-        self.assertEqual(str(self.square),
-            'And(Ge(x, 0), Ge(-x + 1, 0), Ge(y, 0), Ge(-y + 1, 0))')
-

     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, x <= 1, 0 <= y, y <= 1)')

 
     def test_fromstring(self):
 
     def test_fromstring(self):

-        self.assertEqual(Polyhedron.fromstring('{x >= 0, -x + 1 >= 0, '
-            'y >= 0, -y + 1 >= 0}'), self.square)
+        self.assertEqual(
+            Polyhedron.fromstring(
+                '{x >= 0, -x + 1 >= 0, y >= 0, -y + 1 >= 0}'),
+            self.square)

 
     def test_isempty(self):
         self.assertFalse(self.square.isempty())
 
     def test_isempty(self):
         self.assertFalse(self.square.isempty())


@@ -57,14 +54,17 @@ class TestPolyhedron(unittest.TestCase):
     def test_fromsympy(self):
         import sympy
         sp_x, sp_y = sympy.symbols('x y')
     def test_fromsympy(self):
         import sympy
         sp_x, sp_y = sympy.symbols('x y')

-        self.assertEqual(Polyhedron.fromsympy((sp_x >= 0) & (sp_x <= 1) &
-            (sp_y >= 0) & (sp_y <= 1)), self.square)
+        self.assertEqual(
+            Polyhedron.fromsympy(
+                (sp_x >= 0) & (sp_x <= 1) & (sp_y >= 0) & (sp_y <= 1)),
+            self.square)

 
     @requires_sympy
     def test_tosympy(self):
         import sympy
         sp_x, sp_y = sympy.symbols('x y')
 
     @requires_sympy
     def test_tosympy(self):
         import sympy
         sp_x, sp_y = sympy.symbols('x y')

-        self.assertEqual(self.square.tosympy(),
+        self.assertEqual(
+            self.square.tosympy(),

             sympy.And(-sp_x + 1 >= 0, -sp_y + 1 >= 0, sp_x >= 0, sp_y >= 0))
 
 
             sympy.And(-sp_x + 1 >= 0, -sp_y + 1 >= 0, sp_x >= 0, sp_y >= 0))