Document function And() before Or()

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

diff --git a/linpy/tests/test_domains.py b/linpy/tests/test_domains.py
index 4b8c5ea..0955a09 100644 (file)
--- a/linpy/tests/test_domains.py
+++ b/linpy/tests/test_domains.py
@@ -53,9 +53,9 @@ class TestDomain(unittest.TestCase):
             Polyhedron(1)
 
     def test_disjoint(self):
             Polyhedron(1)
 
     def test_disjoint(self):

-        self.assertEqual(self.square1.disjoint(), self.disjoint)
-        self.assertEqual(self.empty.disjoint(), Empty)
-        self.assertEqual(self.universe.disjoint(), self.universe)
+        self.assertEqual(self.square1.make_disjoint(), self.disjoint)
+        self.assertEqual(self.empty.make_disjoint(), Empty)
+        self.assertEqual(self.universe.make_disjoint(), self.universe)

 
     def test_isempty(self):
         self.assertFalse(self.square1.isempty())
 
     def test_isempty(self):
         self.assertFalse(self.square1.isempty())


@@ -115,10 +115,6 @@ class TestDomain(unittest.TestCase):
         self.assertEqual(self.universe.project([]), self.universe)
         self.assertEqual(self.empty.project([]), Empty)
 
         self.assertEqual(self.universe.project([]), self.universe)
         self.assertEqual(self.empty.project([]), 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(), {Symbol('x'): 1, Symbol('y'): 3})
         with self.assertRaises(ValueError):
     def test_sample(self):
         self.assertEqual(self.square6.sample(), {Symbol('x'): 1, Symbol('y'): 3})
         with self.assertRaises(ValueError):


@@ -168,8 +164,3 @@ class TestDomain(unittest.TestCase):
         self.assertEqual(self.square1.lexmax(), self.lexmax)
         self.assertEqual(self.universe.lexmax(), self.universe)
         self.assertEqual(self.empty.lexmax(), Empty)
         self.assertEqual(self.square1.lexmax(), self.lexmax)
         self.assertEqual(self.universe.lexmax(), self.universe)
         self.assertEqual(self.empty.lexmax(), Empty)

-
-    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')))