Make Domain.sample() consistent with Domain.points()

[linpy.git] / pypol / tests / test_domains.py

diff --git a/pypol/tests/test_domains.py b/pypol/tests/test_domains.py
index a6f643c..e4f996c 100644 (file)
--- a/pypol/tests/test_domains.py
+++ b/pypol/tests/test_domains.py
@@ -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)))
@@ -88,10 +87,10 @@ class TestDomain(unittest.TestCase):
         self.assertEqual(~self.universe, Empty)
         self.assertEqual(~self.empty, self.universe)
 
-    def test_polyhedral_hull(self):
-        self.assertEqual(self.square1.polyhedral_hull(), self.hull)
-        self.assertEqual(self.universe.polyhedral_hull(), self.universe)
-        self.assertEqual(self.empty.polyhedral_hull(), self.empty)
+    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)
@@ -104,9 +103,9 @@ class TestDomain(unittest.TestCase):
         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(), {Symbol('x'): 1, Symbol('y'): 3})
+        self.assertEqual(self.empty.sample(), None)
+        self.assertEqual(self.universe.sample(), {})
 
     def test_intersection(self):
         self.assertEqual(self.square1.intersection(self.square2), self.intersection)