From ead3c442d29f0c45989d165f34e27dd0eb7d87c4 Mon Sep 17 00:00:00 2001 From: Vivien Maisonneuve Date: Tue, 1 Jul 2014 18:31:13 +0200 Subject: [PATCH] Fix make test --- examples/diamond.py | 1 - examples/squares.py | 10 ++++------ pypol/tests/test_domains.py | 3 +-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/examples/diamond.py b/examples/diamond.py index 148cdca..ad0942b 100755 --- a/examples/diamond.py +++ b/examples/diamond.py @@ -6,4 +6,3 @@ x, y = symbols('x y') diam = Ge(y, x - 1) & Le(y, x + 1) & Ge(y, -x - 1) & Le(y, -x + 1) print('diamond:', diam) print('projected on x:', diam.drop_dims('y')) - diff --git a/examples/squares.py b/examples/squares.py index e140e30..d606631 100755 --- a/examples/squares.py +++ b/examples/squares.py @@ -8,7 +8,7 @@ sq1 = Le(0, x) & Le(x, 2) & Le(0, y) & Le(y, 2) sq2 = Le(2, x) & Le(x, 4) & Le(2, y) & Le(y, 4) sq3 = Le(0, x) & Le(x, 3) & Le(0, y) & Le(y, 3) sq4 = Le(1, x) & Le(x, 2) & Le(1, y) & Le(y, 2) -sq5 = Le(1, x) & Le(x, 2) & Le(1, y) +sq5 = Le(1, x) & Le(x, 2) & Le(1, y) sq6 = Le(1, x) & Le(x, 2) & Le(1, y) & Eq(y, 3) sq7 = Le(0, x) & Le(x, 2) & Le(0, y) & Eq(z, 2) & Le(a, 3) u = Polyhedron([]) @@ -20,7 +20,7 @@ print('sq3 =', sq3) #print correct square print('sq4 =', sq4) #print correct square print('u =', u) #print correct square print() -print('Â¬sq1 =', ~sq1) #test compliment +print('Â¬sq1 =', ~sq1) #test complement print() print('sq1 + sq1 =', sq1 + sq2) #test addition print('sq1 + sq2 =', Polyhedron(sq1 + sq2)) #test addition @@ -39,7 +39,7 @@ print('sq1 â sq2 =', Polyhedron(sq1 | sq2)) # test convex union print() print('check if sq1 and sq2 disjoint:', sq1.isdisjoint(sq2)) #should return false print() -print('sq1 disjoint:', sq1.disjoint()) #make disjoint +print('sq1 disjoint:', sq1.disjoint()) #make disjoint print('sq2 disjoint:', sq2.disjoint()) #make disjoint print() print('is square 1 universe?:', sq1.isuniverse()) #test if square is universe @@ -54,7 +54,7 @@ print() print('lexographic min of sq2:', sq2.lexmin()) #test lexmax() print('lexographic max of sq2:', sq2.lexmax()) #test lexmax() print() -print('Polyhedral hull of sq1 + sq2 is:', x.polyhedral_hull()) #test polyhedral hull, returns same +print('Polyhedral hull of sq1 + sq2 is:', x.polyhedral_hull()) #test polyhedral hull, returns same #value as Polyhedron(sq1 + sq2) print() print('is sq1 bounded?', sq1.isbounded()) #unbounded should return True @@ -65,5 +65,3 @@ print('sq6 simplified:', sq6.sample()) print() #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 1beaa85..0e06771 100644 --- a/pypol/tests/test_domains.py +++ b/pypol/tests/test_domains.py @@ -76,14 +76,13 @@ 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): self.assertEqual(self.universe.simplify(), self.universe) self.assertEqual(self.empty.simplify(), Empty) -- 2.20.1