From: Danielle Bolan Date: Tue, 1 Jul 2014 14:22:41 +0000 (+0200) Subject: Add basic tests for drop_dims X-Git-Tag: 1.0~181 X-Git-Url: https://scm.cri.ensmp.fr/git/linpy.git/commitdiff_plain/7db03eb9ea6c6d0a3896d8682b64fd404a833e92 Add basic tests for drop_dims --- diff --git a/examples/squares.py b/examples/squares.py index d23e636..e140e30 100755 --- a/examples/squares.py +++ b/examples/squares.py @@ -63,5 +63,7 @@ print() print('sq6:', sq6) print('sq6 simplified:', sq6.sample()) print() -print('sq7 with out constraints involving y and a', sq7.drop_dims('y a')) +#print(u.drop_dims(' ')) +print('sq7 with out constraints involving y and a', sq7.drop_dims('y a')) #drops dims that are passed + diff --git a/pypol/tests/test_domains.py b/pypol/tests/test_domains.py index 555c331..1beaa85 100644 --- a/pypol/tests/test_domains.py +++ b/pypol/tests/test_domains.py @@ -21,6 +21,7 @@ class TestDomain(unittest.TestCase): 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.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))) @@ -75,6 +76,12 @@ class TestDomain(unittest.TestCase): 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_simplify(self):