Changeset 1854

Timestamp:

Sep 28, 2005, 10:29:52 AM (19 years ago)

Author:

ole

Message:

Added functionality for excluding polygons in populate_polygon

Location:

inundation/pyvolution

Files:

• data_manager.py (modified) (3 diffs)
• test_util.py (modified) (1 diff)
• util.py (modified) (3 diffs)

inundation/pyvolution/data_manager.py

@@ -221 +221 @@
     def __init__(self, domain, mode = 'w',\
                  max_size = 2000000000,
-                 recursion=False):
+                 recursion = False):
         from Scientific.IO.NetCDF import NetCDFFile
         from Numeric import Int, Float, Float32
@@ -1631 +1631 @@
     from Scientific.IO.NetCDF import NetCDFFile
     from Numeric import Float, Int, Int32, searchsorted, zeros, array
+    from Numeric import allclose, around
+        
     precision = Float
 
@@ -1651 +1653 @@
 
 
-    e_lat = file_e.variables['LAT'][:]
-
+
+    #Precision used by most for lat/lon is 4 or 5 decimals
+    e_lat = around(file_e.variables['LAT'][:], 5)
+    e_lon = around(file_e.variables['LON'][:], 5)
 
     #Check that files are compatible
-    from Numeric import allclose
     assert allclose(latitudes, file_u.variables['LAT'])
-    assert allclose(latitudes, file_v.variables['LAT'])    
-    assert allclose(latitudes, file_e.variables['LAT'])
+    assert allclose(latitudes, file_v.variables['LAT'])
+    assert allclose(latitudes, e_lat)
 
     assert allclose(longitudes, file_u.variables['LON'])
     assert allclose(longitudes, file_v.variables['LON'])
-    assert allclose(longitudes, file_e.variables['LON'])    
+    assert allclose(longitudes, e_lon)    
 
 

inundation/pyvolution/test_util.py

@@ -1112 +1112 @@
 
 
+    def test_populate_polygon_with_exclude(self):
+        
+
+        polygon = [[0,0], [1,0], [1,1], [0,1]]
+        ex_poly = [[0,0], [0.5,0], [0.5, 0.5], [0,0.5]] #SW quarter
+        points = populate_polygon(polygon, 5, exclude = [ex_poly])
+
+        assert len(points) == 5
+        for point in points:
+            assert inside_polygon(point, polygon)
+            assert not inside_polygon(point, ex_poly)            
+
+
+        #overlap
+        polygon = [[0,0], [1,0], [1,1], [0,1]]
+        ex_poly = [[-1,-1], [0.5,0], [0.5, 0.5], [-1,0.5]]
+        points = populate_polygon(polygon, 5, exclude = [ex_poly])
+
+        assert len(points) == 5
+        for point in points:
+            assert inside_polygon(point, polygon)
+            assert not inside_polygon(point, ex_poly)                        
+        
+        #Multiple
+        polygon = [[0,0], [1,0], [1,1], [0,1]]
+        ex_poly1 = [[0,0], [0.5,0], [0.5, 0.5], [0,0.5]] #SW quarter
+        ex_poly2 = [[0.5,0.5], [0.5,1], [1, 1], [1,0.5]] #NE quarter        
+        
+        points = populate_polygon(polygon, 20, exclude = [ex_poly1, ex_poly2])
+
+        assert len(points) == 20
+        for point in points:
+            assert inside_polygon(point, polygon)
+            assert not inside_polygon(point, ex_poly1)
+            assert not inside_polygon(point, ex_poly2)                                
+        
+
+        #Very convoluted polygon
+        polygon = [[0,0], [10,10], [15,5], [20, 10], [25,0], [30,10], [40,-10]]
+        ex_poly = [[-1,-1], [5,0], [5, 5], [-1,5]]
+        points = populate_polygon(polygon, 20, exclude = [ex_poly])
+        
+        assert len(points) == 20
+        for point in points:
+            assert inside_polygon(point, polygon)
+            assert not inside_polygon(point, ex_poly), '%s' %str(point)                        
+
+
 
 #-------------------------------------------------------------

inundation/pyvolution/util.py

@@ -777 +777 @@
     return polygon
 
-def populate_polygon(polygon, number_of_points, seed = None):
+def populate_polygon(polygon, number_of_points, seed = None, exclude = None):
     """Populate given polygon with uniformly distributed points.
 
@@ -784 +784 @@
        number_of_points - (optional) number of points
        seed - seed for random number generator (default=None)
+       exclude - list of polygons (inside main polygon) from where points should be excluded 
 
     Output:
@@ -815 +816 @@
         y = uniform(min_y, max_y)
 
+        append = False
         if inside_polygon( [x,y], polygon ):
-            points.append([x,y])
+
+            append = True
+            
+            #Check exclusions
+            if exclude is not None:
+                for ex_poly in exclude:
+                    if inside_polygon( [x,y], ex_poly ):
+                        append = False
+                        
+                    
+        if append is True:                
+            points.append([x,y])                
 
     return points
+
+
 
 def tsh2sww(filename, verbose=True):