X-Git-Url: https://svn.cri.ensmp.fr/git/linpy.git/blobdiff_plain/ea1451506357e9c8de93a6058cecec042eef5b46..8c9a4d4d0ecef68ff3cd0f7806a69013d34a2013:/pypol/tests/test_domains.py diff --git a/pypol/tests/test_domains.py b/pypol/tests/test_domains.py index f0f241f..820d556 100644 --- a/pypol/tests/test_domains.py +++ b/pypol/tests/test_domains.py @@ -1,7 +1,7 @@ import unittest from ..domains import * -from ..linexprs import symbols +from ..linexprs import Symbol, symbols from ..polyhedra import * @@ -19,8 +19,9 @@ 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)) self.intersection = And(Ge(x - 1, 0), Ge(-x + 2, 0), Ge(y - 1, 0), Ge(-y + 2, 0)) self.union = Or(And(Ge(x, 0), Ge(-x + 2, 0), Ge(y, 0), Ge(-y + 2, 0)), And(Ge(x - 1, 0), Ge(-x + 3, 0), Ge(y - 1, 0), Ge(-y + 3, 0))) @@ -37,10 +38,13 @@ class TestDomain(unittest.TestCase): def test_disjoint(self): self.assertEqual(self.square1.disjoint(), self.disjoint) + self.assertEqual(self.empty.disjoint(), Empty) + self.assertEqual(self.universe.disjoint(), self.universe) def test_isempty(self): self.assertFalse(self.square1.isempty()) self.assertTrue(self.empty.isempty()) + self.assertFalse(self.universe.isempty()) def test_isuniverse(self): self.assertFalse(self.square1.isuniverse()) @@ -51,56 +55,86 @@ class TestDomain(unittest.TestCase): self.assertFalse(self.unbound_poly.isbounded()) def test_eq(self): - self.assertTrue(self.square1.__eq__(self.square1)) - self.assertFalse(self.square1.__eq__(self.square2)) + self.assertTrue(self.square1 == self.square1) + self.assertFalse(self.square1 == self.square2) + self.assertFalse(self.empty == self.universe) def test_isdisjoint(self): self.assertFalse(self.square1.isdisjoint(self.square2)) + self.assertFalse(self.universe.isdisjoint(self.square1)) self.assertTrue(self.square1.isdisjoint(self.square5)) + self.assertTrue(self.empty.isdisjoint(self.square1)) def test_issubset(self): self.assertTrue(self.square4.issubset(self.unbound_poly)) self.assertFalse(self.square1.issubset(self.square2)) + self.assertTrue(self.square1.issubset(self.universe)) + self.assertTrue(self.empty.issubset(self.square1)) def test_le(self): - self.assertTrue(self.square4.__le__(self.square3)) - self.assertFalse(self.square3.__le__(self.square4)) + self.assertTrue(self.square4 <= self.square3) + self.assertFalse(self.square3 <= self.square4) + self.assertTrue(self.empty <= self.square1) + self.assertTrue(self.square1 <= self.universe) def test_lt(self): - self.assertTrue(self.square4.__lt__(self.square3)) - self.assertFalse(self.square3.__lt__(self.square4)) + self.assertTrue(self.square4 < self.square3) + self.assertFalse(self.square3 < self.square4) + self.assertTrue(self.empty < self.square1) + self.assertTrue(self.square1 < self.universe) + + def test_complement(self): + self.assertEqual(~self.square1, self.complement) + self.assertEqual(~self.universe, Empty) + self.assertEqual(~self.empty, self.universe) + + def test_aspolyhedron(self): + self.assertEqual(self.square1.aspolyhedron(), self.hull) + self.assertEqual(self.universe.aspolyhedron(), self.universe) + self.assertEqual(self.empty.aspolyhedron(), self.empty) + + def test_project(self): + self.assertEqual(self.square1.project(symbols('x')), self.dropped) + self.assertEqual(self.square1.project(symbols('x y')), self.universe) + self.assertEqual(self.universe.project([]), self.universe) + self.assertEqual(self.empty.project([]), Empty) - def test_compliment(self): - self.assertEqual(~self.square1, self.compliment) - - def test_polyhedral_hull(self): - self.assertEqual(self.square1.polyhedral_hull(), self.hull) - - @unittest.expectedFailure def test_simplify(self): self.assertEqual(self.universe.simplify(), self.universe) self.assertEqual(self.empty.simplify(), Empty) def test_sample(self): + self.assertEqual(self.square6.sample(), self.sample) self.assertEqual(self.empty.sample(), Empty) self.assertEqual(self.universe.sample(), self.universe) - self.assertEqual(self.square6.sample(), self.sample) def test_intersection(self): self.assertEqual(self.square1.intersection(self.square2), self.intersection) def test_and(self): self.assertEqual(self.square2 & self.square1, self.intersection) + self.assertEqual(self.square1 & self.universe, self.square1) + self.assertEqual(self.empty & self.square1, Empty) + self.assertEqual(self.universe & self.universe, self.universe) + self.assertEqual(self.universe & self.empty, Empty) + self.assertEqual(self.empty & self.empty, Empty) def test_union(self): self.assertEqual(self.square1.union(self.square2), self.union) + self.assertEqual(self.square1.union(self.empty), self.square1) + self.assertEqual(self.square1.union(self.universe), self.universe) + self.assertEqual(self.universe.union(self.universe), self.universe) + self.assertEqual(self.empty.union(self.empty), self.empty) def test_or(self): - self.assertEqual(self.square1.__or__(self.square2), self.union) + self.assertEqual(self.square1 | self.square2, self.union) def test_add(self): - self.assertEqual(self.square2.__add__(self.square1), self.sum1) + self.assertEqual(self.square2 + self.square1, self.sum1) self.assertEqual(Polyhedron(self.square1 + self.square2), self.sum2) + self.assertEqual(self.universe + self.square1, self.universe) + self.assertEqual(self.empty + self.square1, self.square1) + self.assertEqual(self.universe + self.universe, self.universe) def test_difference(self): self.assertEqual(self.square2 - self.square1, self.difference1) @@ -110,6 +144,20 @@ class TestDomain(unittest.TestCase): def test_lexmin(self): self.assertEqual(self.square1.lexmin(), self.lexmin) + self.assertEqual(self.universe.lexmin(), self.universe) + self.assertEqual(self.empty.lexmin(), Empty) def test_lexmax(self): self.assertEqual(self.square1.lexmax(), self.lexmax) + self.assertEqual(self.universe.lexmax(), self.universe) + self.assertEqual(self.empty.lexmax(), Empty) + + def test_num_parameters(self): + self.assertEqual(self.square1.num_parameters(), 2) + self.assertEqual(self.empty.num_parameters(), 0) + self.assertEqual(self.universe.num_parameters(), 0) + + def test_involves_dims(self): + self.assertTrue(self.square1.involves_dims(symbols('x y'))) + self.assertFalse(self.empty.involves_dims(symbols('x'))) + self.assertFalse(self.universe.involves_dims(symbols('x')))