Changeset 2533

Timestamp:

Mar 13, 2006, 2:18:40 PM (19 years ago)

Author:

ole

Message:

Work on area histogram

Location:

inundation

Files:

• examples/beach.py (modified) (2 diffs)
• pyvolution/mesh.py (modified) (2 diffs)
• pyvolution/test_pmesh2domain.py (modified) (1 diff)
• utilities/numerical_tools.py (modified) (2 diffs)
• utilities/test_numerical_tools.py (modified) (1 diff)

inundation/examples/beach.py

@@ -10 +10 @@
 ######################
 # Module imports 
-#
 
 import sys
@@ -16 +15 @@
 #sys.path.append('..'+sep+'pyvolution')
 
-from shallow_water import Domain, Reflective_boundary, Dirichlet_boundary,\
+from pyvolution.shallow_water import Domain, Reflective_boundary, Dirichlet_boundary,\
      Transmissive_boundary, Time_boundary, Wind_stress
 
-from pmesh2domain import pmesh_to_domain_instance
-from util import read_polygon, Polygon_function
+from pyvolution.pmesh2domain import pmesh_to_domain_instance
+from utilities.polygon import read_polygon, Polygon_function
 from math import pi
 from Numeric import choose, greater, ones, sin, exp

inundation/pyvolution/mesh.py

@@ -620 +620 @@
         """
 
+        from Numeric import arange
+        from utilities.numerical_tools import histogram
+
         vertex_coordinates = self.vertex_coordinates
         areas = self.areas
         x = vertex_coordinates[:,0]
-        y = vertex_coordinates[:,1]                
+        y = vertex_coordinates[:,1]
+
+
+        #Setup 10 bins for area histogram
+        m = max(areas)
+        bins = arange(0, m/10, m)
+        hist = histogram(areas, bins)
 
         str =  '------------------------------------------------\n'
@@ -633 +642 @@
         str += '  Areas:\n'
         str += '    A in [%f, %f]\n' %(min(areas), max(areas))
+        str += '    Histogram:\n'
+        for i, count in enumerate(hist):
+            str += '      >=%f: %d\n' %(bins[i], count)
+                      
         str += 'Boundary:\n'
         str += '  Number of boundary segments == %d\n' %(len(self.boundary))

inundation/pyvolution/test_pmesh2domain.py

@@ -169 +169 @@
 
          domain = pmesh_instance_to_domain_instance(mesh_instance, Domain)
+
          os.remove(fileName)
          #print "domain.tagged_elements", domain.tagged_elements

inundation/utilities/numerical_tools.py

@@ -8 +8 @@
 #(this should move to somewhere central)
 try:
-    from scipy import ArrayType, array, sum, innerproduct, ravel, sqrt    
+    from scipy import ArrayType, array, sum, innerproduct, ravel, sqrt, searchsorted, sort, concatenate    
 except:
     print 'Could not find scipy - using Numeric'
-    from Numeric import ArrayType, array, sum, innerproduct, ravel, sqrt
+    from Numeric import ArrayType, array, sum, innerproduct, ravel, sqrt, searchsorted, sort, concatenate    
     
 
@@ -190 +190 @@
 
 
+
+def histogram(a, bins):
+    """Standard histogram straight from the Numeric manual
+    """
+
+    n = searchsorted(sort(a), bins)
+    n = concatenate( [n, [len(a)]] )
+    return n[1:]-n[:-1]
+
+
+
 ####################################################################
 #Python versions of function that are also implemented in numerical_tools_ext.c

inundation/utilities/test_numerical_tools.py

@@ -141 +141 @@
 
 
+    def test_histogram(self):
+        """Test histogram with different bin boundaries
+        """
+        
+        a = [1,1,1,1,1,2,1,3,2,3,1,2,3,4,1]
+
+
+        #There are four elements greater than or equal to 3
+        bins = [3]
+        assert allclose(histogram(a, bins), [4])
+
+
+        bins = [ min(a) ]
+        assert allclose(histogram(a, bins), [len(a)])
+
+
+        bins = [ max(a)+0.00001 ]
+        assert allclose(histogram(a, bins), [0])        
+
+        
+        bins = [1,2,3,4]
+        assert allclose(histogram(a, bins), [8,3,3,1])
+
+
+        bins = [0.5,1.5,2,3]
+        assert allclose(histogram(a, bins), [8,0,3,4])
+
+
+        
+
     def test_that_C_extension_compiles(self):
         FN = 'util_ext.c'