Fix unitary tests

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

diff --git a/pypol/tests/test_domains.py b/pypol/tests/test_domains.py
index a6f643c..2907f09 100644 (file)
--- a/pypol/tests/test_domains.py
+++ b/pypol/tests/test_domains.py
@@ -1,3 +1,20 @@
+# Copyright 2014 MINES ParisTech
+#
+# This file is part of Linpy.
+#
+# Linpy is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Linpy is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Linpy.  If not, see <http://www.gnu.org/licenses/>.
+
 import unittest
 
 from ..domains import *
@@ -22,7 +39,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 +104,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 +120,10 @@ 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})
+        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)
@@ -152,12 +169,7 @@ class TestDomain(unittest.TestCase):
         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')))
+    def test_involves_vars(self):
+        self.assertTrue(self.square1.involves_vars(symbols('x y')))
+        self.assertFalse(self.empty.involves_vars(symbols('x')))
+        self.assertFalse(self.universe.involves_vars(symbols('x')))