X-Git-Url: https://svn.cri.ensmp.fr/git/linpy.git/blobdiff_plain/b47140c554b345a934698a04a2a8c0e64685ed17..de11b4e658edf3ea876aaea3d3d681eaec13dcc4:/pypol/tests/test_domains.py?ds=sidebyside

diff --git a/pypol/tests/test_domains.py b/pypol/tests/test_domains.py
index 692627c..4d38075 100644
--- a/pypol/tests/test_domains.py
+++ b/pypol/tests/test_domains.py
@@ -1,7 +1,7 @@
 import unittest
 
 from ..domains import *
-from ..linexprs import symbols
+from ..linexprs import Symbol, symbols
 from ..polyhedra import *
 
 
@@ -38,10 +38,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 +57,74 @@ 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.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)
+        self.assertEqual(self.universe.polyhedral_hull(), self.universe)
+        self.assertEqual(self.empty.polyhedral_hull(), self.empty)
 
-    def test_drop_dims(self):
-        self.assertEqual(self.square1.drop_dims('x'), self.dropped)
-        self.assertEqual(self.square1.drop_dims('x y'), self.universe)
-        self.assertEqual(self.universe.drop_dims(' '), self.universe)
-        self.assertEqual(self.empty.drop_dims(' '), 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_simplify(self):
         self.assertEqual(self.universe.simplify(), self.universe)
         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(), self.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):
     def test_add(self):
         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')))