X-Git-Url: https://svn.cri.ensmp.fr/git/linpy.git/blobdiff_plain/7db03eb9ea6c6d0a3896d8682b64fd404a833e92..1154bf4ff8c2d7e7882703917a58d3a42995d78a:/pypol/tests/test_domains.py?ds=sidebyside diff --git a/pypol/tests/test_domains.py b/pypol/tests/test_domains.py index 1beaa85..55853fd 100644 --- a/pypol/tests/test_domains.py +++ b/pypol/tests/test_domains.py @@ -19,7 +19,7 @@ class TestDomain(unittest.TestCase): self.universe = Polyhedron([]) self.empty = Empty self.disjoint = And(Ge(x, 0), Ge(-x + 2, 0), Ge(y, 0), Ge(-y + 2, 0)) - self.compliment = Or(Ge(-x - 1, 0), Ge(x - 3, 0), And(Ge(x, 0), Ge(-x + 2, 0), Ge(-y - 1, 0)), And(Ge(x, 0), Ge(-x + 2, 0), Ge(y - 3, 0))) + self.complement = Or(Ge(-x - 1, 0), Ge(x - 3, 0), And(Ge(x, 0), Ge(-x + 2, 0), Ge(-y - 1, 0)), And(Ge(x, 0), Ge(-x + 2, 0), Ge(y - 3, 0))) self.hull = And(Ge(x, 0), Ge(-x + 2, 0), Ge(y, 0), Ge(-y + 2, 0)) self.dropped = And(Ge(y, 0), Ge(-y + 2, 0)) self.sample = And(Eq(y - 3, 0), Eq(x - 1, 0)) @@ -71,19 +71,18 @@ class TestDomain(unittest.TestCase): self.assertTrue(self.square4 < self.square3) self.assertFalse(self.square3 < self.square4) - def test_compliment(self): - self.assertEqual(~self.square1, self.compliment) + def test_complement(self): + self.assertEqual(~self.square1, self.complement) def test_polyhedral_hull(self): self.assertEqual(self.square1.polyhedral_hull(), self.hull) - - def test_drop_dims(self): - self.assertEqual(self.square1.drop_dims('x'), self.dropped) - self.assertEqual(self.square1.drop_dims('x y'), self.universe) - self.assertEqual(self.universe.drop_dims(' '), self.universe) - self.assertEqual(self.empty.drop_dims(' '), Empty) - - @unittest.expectedFailure + + def test_project_out(self): + self.assertEqual(self.square1.project_out('x'), self.dropped) + self.assertEqual(self.square1.project_out('x y'), self.universe) + self.assertEqual(self.universe.project_out(' '), self.universe) + self.assertEqual(self.empty.project_out(' '), Empty) + def test_simplify(self): self.assertEqual(self.universe.simplify(), self.universe) self.assertEqual(self.empty.simplify(), Empty)