index f0f241f..0e06771 100644 (file)
@@ -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)))
@@ -51,8 +52,8 @@ 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)

def test_isdisjoint(self):
self.assertFalse(self.square1.isdisjoint(self.square2))
@@ -63,12 +64,12 @@ class TestDomain(unittest.TestCase):
self.assertFalse(self.square1.issubset(self.square2))

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)

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)

def test_compliment(self):
self.assertEqual(~self.square1, self.compliment)
@@ -76,7 +77,12 @@ class TestDomain(unittest.TestCase):
def test_polyhedral_hull(self):
self.assertEqual(self.square1.polyhedral_hull(), self.hull)

-    @unittest.expectedFailure
+    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)
+
def test_simplify(self):
self.assertEqual(self.universe.simplify(), self.universe)
self.assertEqual(self.empty.simplify(), Empty)
@@ -96,10 +102,10 @@ class TestDomain(unittest.TestCase):
self.assertEqual(self.square1.union(self.square2), self.union)

def test_or(self):
-        self.assertEqual(self.square1.__or__(self.square2), self.union)
+        self.assertEqual(self.square1 | self.square2, self.union)