Raise ValueError when sampling an empty Domain

diff --git a/pypol/domains.py b/pypol/domains.py
index 6088e3251007cbd2bbfff5e9622af0d061124a0f..1ffed45af7c111691c6fde98b633c7a5d19df463 100644 (file)
--- a/pypol/domains.py
+++ b/pypol/domains.py
@@ -168,17 +168,17 @@ class Domain:
         return Domain._fromislset(islset, dims)
 
     def sample(self):
-        from .polyhedra import Polyhedron
         islset = self._toislset(self.polyhedra, self.symbols)
         islpoint = libisl.isl_set_sample_point(islset)
+        if bool(libisl.isl_point_is_void(islpoint)):
+            libisl.isl_point_free(islpoint)
+            raise ValueError('domain must be non-empty')
         point = {}
         for index, symbol in enumerate(self.symbols):
             coordinate = libisl.isl_point_get_coordinate_val(islpoint,
                 libisl.isl_dim_set, index)
             coordinate = islhelper.isl_val_to_int(coordinate)
             point[symbol] = coordinate
-        if bool(libisl.isl_point_is_void(islpoint)):
-            point = None
         libisl.isl_point_free(islpoint)
         return point
 

diff --git a/pypol/tests/test_domains.py b/pypol/tests/test_domains.py
index e4f996c24e7e78158332144205e145a3511c1eef..755547e373219cbb6ac7f76a7f961b500a05007f 100644 (file)
--- a/pypol/tests/test_domains.py
+++ b/pypol/tests/test_domains.py
@@ -104,7 +104,8 @@ class TestDomain(unittest.TestCase):
 
     def test_sample(self):
         self.assertEqual(self.square6.sample(), {Symbol('x'): 1, Symbol('y'): 3})
-        self.assertEqual(self.empty.sample(), None)
+        with self.assertRaises(ValueError):
+            self.empty.sample()
         self.assertEqual(self.universe.sample(), {})
 
     def test_intersection(self):