index e9dd1cd..755547e 100644 (file)
@@ -22,7 +22,6 @@ class TestDomain(unittest.TestCase):
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)))
self.sum1 = 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)))
@@ -38,10 +37,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())
@@ -54,52 +56,75 @@ class TestDomain(unittest.TestCase):
def test_eq(self):
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 <= 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 < 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_polyhedral_hull(self):
-        self.assertEqual(self.square1.polyhedral_hull(), self.hull)
+    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_out(self):
-        self.assertEqual(self.square1.project_out(symbols('x')), self.dropped)
-        self.assertEqual(self.square1.project_out(symbols('x y')), self.universe)
-        self.assertEqual(self.universe.project_out([]), self.universe)
-        self.assertEqual(self.empty.project_out([]), 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_simplify(self):
self.assertEqual(self.universe.simplify(), self.universe)
self.assertEqual(self.empty.simplify(), Empty)

def test_sample(self):
-        self.assertEqual(self.empty.sample(), Empty)
-        self.assertEqual(self.universe.sample(), self.universe)
-        self.assertEqual(self.square6.sample(), self.sample)
+        self.assertEqual(self.square6.sample(), {Symbol('x'): 1, Symbol('y'): 3})
+        with self.assertRaises(ValueError):
+            self.empty.sample()
+        self.assertEqual(self.universe.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 | self.square2, self.union)
@@ -107,6 +132,9 @@ class TestDomain(unittest.TestCase):
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)
@@ -116,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')))