From ef94baf60054758dcea30bc444d0002fec2da361 Mon Sep 17 00:00:00 2001 From: Vivien Maisonneuve Date: Sat, 5 Jul 2014 16:53:14 +0200 Subject: [PATCH] Raise ValueError when sampling an empty Domain --- pypol/domains.py | 6 +++--- pypol/tests/test_domains.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pypol/domains.py b/pypol/domains.py index 6088e32..1ffed45 100644 --- 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 e4f996c..755547e 100644 --- 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): -- 2.20.1