X-Git-Url: https://svn.cri.ensmp.fr/git/linpy.git/blobdiff_plain/fb070deb31a82b789e1be4ffc5dfa64b4b7a9e36..960f0c252361dfd696359f803aae40a9b13b14a6:/pypol/tests/test_polyhedra.py?ds=inline diff --git a/pypol/tests/test_polyhedra.py b/pypol/tests/test_polyhedra.py index 7b8e033..30d5d5f 100644 --- a/pypol/tests/test_polyhedra.py +++ b/pypol/tests/test_polyhedra.py @@ -1,3 +1,20 @@ +# Copyright 2014 MINES ParisTech +# +# This file is part of Linpy. +# +# Linpy is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Linpy is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Linpy. If not, see . + import functools import unittest @@ -13,18 +30,18 @@ class TestPolyhedron(unittest.TestCase): self.square = Polyhedron(inequalities=[x, 1 - x, y, 1 - y]) def test_symbols(self): - self.assertCountEqual(self.square.symbols, symbols('x y')) + self.assertTupleEqual(self.square.symbols, symbols('x y')) def test_dimension(self): self.assertEqual(self.square.dimension, 2) def test_str(self): self.assertEqual(str(self.square), - 'And(0 <= x, 0 <= -x + 1, 0 <= y, 0 <= -y + 1)') + 'And(Ge(x, 0), Ge(-x + 1, 0), Ge(y, 0), Ge(-y + 1, 0))') def test_repr(self): self.assertEqual(repr(self.square), - "And(0 <= x, 0 <= -x + 1, 0 <= y, 0 <= -y + 1)") + "And(Ge(x, 0), Ge(-x + 1, 0), Ge(y, 0), Ge(-y + 1, 0))") def test_fromstring(self): self.assertEqual(Polyhedron.fromstring('{x >= 0, -x + 1 >= 0, '