pushing recent changes before playing with project

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

diff --git a/pypol/tests/test_domains.py b/pypol/tests/test_domains.py
index e31d8e7..17e20fd 100644 (file)
--- a/pypol/tests/test_domains.py
+++ b/pypol/tests/test_domains.py
@@ -13,13 +13,16 @@ class TestDomain(unittest.TestCase):
         self.square1 = Polyhedron(inequalities=[x, 2 - x, y, 2 - y])
         self.square2 = Polyhedron(inequalities=[x - 1, 3 - x , y - 1, 3 - y]) #correct representation
         self.square3 = Polyhedron(inequalities=[x, 3 - x, y, 3 - y])
         self.square1 = Polyhedron(inequalities=[x, 2 - x, y, 2 - y])
         self.square2 = Polyhedron(inequalities=[x - 1, 3 - x , y - 1, 3 - y]) #correct representation
         self.square3 = Polyhedron(inequalities=[x, 3 - x, y, 3 - y])

-        self.square4 = Polyhedron(inequalities=[x - 1, 2 - x, y - 1, 2 - y])
-        self.square5 = Polyhedron(inequalities=[x, 3 - x, y, 3 - y])
-        self.square6 = Polyhedron(inequalities=[x - 3, 6 - x, y - 3, 6 -y])
+        self.square4 = Polyhedron(inequalities=[x - 1, 2 - x, y - 1, 2 - y]) 
+        self.square5 = Polyhedron(inequalities=[x - 3, 6 - x, y - 3, 6 -y])
+        self.square6 = Polyhedron(equalities=[3 - y], inequalities=[x - 1, 3 - x, y - 1])
+        self.unbound_poly = Polyhedron(inequalities=[x, 3 - x, y])

         self.universe = Polyhedron([])
         self.universe = Polyhedron([])

+        self.empty = Empty

         self.disjoint = And(Ge(x, 0), Ge(-x + 2, 0), Ge(y, 0), Ge(-y + 2, 0))
         self.compliment = 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.disjoint = And(Ge(x, 0), Ge(-x + 2, 0), Ge(y, 0), Ge(-y + 2, 0))
         self.compliment = 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.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)))
         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)))


@@ -38,6 +41,7 @@ class TestDomain(unittest.TestCase):
         
     def test_isempty(self):
         self.assertFalse(self.square1.isempty())
         
     def test_isempty(self):
         self.assertFalse(self.square1.isempty())

+        self.assertTrue(self.empty.isempty())

 
     def test_isuniverse(self):
         self.assertFalse(self.square1.isuniverse())
 
     def test_isuniverse(self):
         self.assertFalse(self.square1.isuniverse())


@@ -45,42 +49,42 @@ class TestDomain(unittest.TestCase):
 
     def test_isbounded(self):
         self.assertTrue(self.square1.isbounded())
 
     def test_isbounded(self):
         self.assertTrue(self.square1.isbounded())

+        self.assertFalse(self.unbound_poly.isbounded())

 
     def test_eq(self):
 
     def test_eq(self):

-        self.assertTrue(self.square3.__eq__(self.square5))

         self.assertTrue(self.square1.__eq__(self.square1))
         self.assertFalse(self.square1.__eq__(self.square2))
     
     def test_isdisjoint(self):
         self.assertFalse(self.square1.isdisjoint(self.square2))
         self.assertTrue(self.square1.__eq__(self.square1))
         self.assertFalse(self.square1.__eq__(self.square2))
     
     def test_isdisjoint(self):
         self.assertFalse(self.square1.isdisjoint(self.square2))

-        self.assertTrue(self.square1.isdisjoint(self.square6))
+        self.assertTrue(self.square1.isdisjoint(self.square5))

     
     def test_issubset(self):
     
     def test_issubset(self):

-        self.assertTrue(self.square4.issubset(self.square5))
+        self.assertTrue(self.square4.issubset(self.unbound_poly))

         self.assertFalse(self.square1.issubset(self.square2))
     
     def test_le(self):
         self.assertFalse(self.square1.issubset(self.square2))
     
     def test_le(self):

-        self.assertTrue(self.square4.__lt__(self.square3))
+        self.assertTrue(self.square4.__le__(self.square3))
+        self.assertFalse(self.square3.__le__(self.square4))

     
     def test_lt(self):
     
     def test_lt(self):

-        self.assertTrue(self.square4.__le__(self.square3))
+        self.assertTrue(self.square4.__lt__(self.square3))
+        self.assertFalse(self.square3.__lt__(self.square4))

           
     def test_compliment(self):
         self.assertEqual(~self.square1, self.compliment)
     
           
     def test_compliment(self):
         self.assertEqual(~self.square1, self.compliment)
     

-    def test_simplify(self):
-        #maybe wont need this method
-        pass
-    

     def test_polyhedral_hull(self):
         self.assertEqual(self.square1.polyhedral_hull(), self.hull)
     
     def test_polyhedral_hull(self):
         self.assertEqual(self.square1.polyhedral_hull(), self.hull)
     

-    def test_project(self):
-        #maybe wont need this method
-        pass
+    def test_simplify(self):
+        self.assertEqual(self.universe.simplify(), self.universe)
+        self.assertEqual(self.empty.simplify(), Empty)

     
     def test_sample(self):
     
     def test_sample(self):

-        pass
+        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_intersection(self):
         self.assertEqual(self.square1.intersection(self.square2), self.intersection)


@@ -101,14 +105,12 @@ class TestDomain(unittest.TestCase):
     def test_difference(self):
         self.assertEqual(self.square2 - self.square1, self.difference1)
         self.assertEqual(Polyhedron(self.square2 - self.square1), self.difference2)
     def test_difference(self):
         self.assertEqual(self.square2 - self.square1, self.difference1)
         self.assertEqual(Polyhedron(self.square2 - self.square1), self.difference2)

+        self.assertEqual(self.square2 - self.square2, Empty)
+        self.assertEqual(self.universe - self.universe, Empty)

     
     def test_lexmin(self):
         self.assertEqual(self.square1.lexmin(), self.lexmin)
 
     def test_lexmax(self):
         self.assertEqual(self.square1.lexmax(), self.lexmax)
     
     def test_lexmin(self):
         self.assertEqual(self.square1.lexmin(), self.lexmin)
 
     def test_lexmax(self):
         self.assertEqual(self.square1.lexmax(), self.lexmax)

-    
-
-
-        pass