Changeset 664 for inundation/ga/storm_surge/pyvolution/test_util.py

Timestamp:

Dec 2, 2004, 3:28:33 PM (20 years ago)

Author:

ole

Message:

Added arbitrary functions to Polygon_function

File:

• inundation/ga/storm_surge/pyvolution/test_util.py (modified) (5 diffs)

inundation/ga/storm_surge/pyvolution/test_util.py

@@ -8 +8 @@
 from util import *
 from config import epsilon
+
+
+def test_function(x, y):
+    return x+y
 
 class TestCase(unittest.TestCase):
@@ -334 +338 @@
         
         
-    def test_polygon_function(self):
+    def test_polygon_function_constants(self):
         p1 = [[0,0], [10,0], [10,10], [0,10]]
         p2 = [[0,0], [10,10], [15,5], [20, 10], [25,0], [30,10], [40,-10]]
@@ -353 +357 @@
         assert allclose(z, [2,1,0,2])   
         
+        
+    def test_polygon_function_callable(self):
+        """Check that values passed into Polygon_function can be callable 
+        themselves.
+        """
+        p1 = [[0,0], [10,0], [10,10], [0,10]]
+        p2 = [[0,0], [10,10], [15,5], [20, 10], [25,0], [30,10], [40,-10]]
+        
+        f = Polygon_function( [(p1, test_function)] )   
+        z = f([5, 5, 27, 35], [5, 9, 8, -5]) #Two first inside p1
+        assert allclose(z, [10,14,0,0])
+                
+        #Combined       
+        f = Polygon_function( [(p1, test_function), (p2, 2.0)] )
+        z = f([5, 5, 27, 35], [5, 9, 8, -5]) 
+        assert allclose(z, [2,14,0,2])  
+        
+        
+        #Combined w default     
+        f = Polygon_function( [(p1, test_function), (p2, 2.0)], default = 3.14)
+        z = f([5, 5, 27, 35], [5, 9, 8, -5]) 
+        assert allclose(z, [2,14,3.14,2])               
+        
+        
+        #Combined w default func        
+        f = Polygon_function( [(p1, test_function), (p2, 2.0)], 
+                              default = test_function)
+        z = f([5, 5, 27, 35], [5, 9, 8, -5]) 
+        assert allclose(z, [2,14,35,2])                 
         
         
@@ -467 +500 @@
         assert inside_polygon( (10.5, 10.5), polygon )                  
         
-        #FIXME: Fails
-        #assert not inside_polygon( (5.5, 5.5), polygon )                               
+        #FIXME: Fails if point is 5.5, 5.5
+        assert not inside_polygon( (0, 5.5), polygon )                          
 
         #Polygon with a hole    
@@ -475 +508 @@
                         
         assert inside_polygon( (0, -0.5), polygon )
-        
-        #FIXME: Fails   
-        #assert not inside_polygon( (0.5, 0.5), polygon )       
+        assert not inside_polygon( (0.5, 0.5), polygon )