Changeset 2514

Timestamp:

Mar 9, 2006, 3:02:32 PM (19 years ago)

Author:

sexton

Message:

fixed dem2pts to remove NODATA values + unit test

Location:

inundation/pyvolution

Files:

• data_manager.py (modified) (2 diffs)
• test_data_manager.py (modified) (1 diff)

inundation/pyvolution/data_manager.py

@@ -1129 +1129 @@
     import os
     from Scientific.IO.NetCDF import NetCDFFile
-    from Numeric import Float, zeros, reshape
+    from Numeric import Float, zeros, reshape, sum
 
     root = basename_in
@@ -1202 +1202 @@
     nn = 0
     no_counts = []
-    print 'I think NODATA_values is:    ', NODATA_value
     for i in range(nrows):
-        v = [dem_elevation_r[i,:]]
-        this_count = v.count(NODATA_value)
-        nn = nn + this_count
+        v = dem_elevation_r[i,:]
+        this_count = sum(v == NODATA_value)
+        nn += this_count
         no_counts.append(this_count)
 

inundation/pyvolution/test_data_manager.py

@@ -797 +797 @@
                 x = j*25.0
                 z = x+2*y
-                #if j == 4: z = NODATA_value
-                #if i == 1 and j == 2: z = NODATA_value
-                #if i == 2 and j == 4: z = NODATA_value
-                #if i == 3 and j == 3: z = NODATA_value
-                #if i == 5 and j == 1: z = NODATA_value
-                if i == 0 and j == 0: z = NODATA_value
-                if i == 0 and j == 1: z = NODATA_value
-                if i == 0 and j == 2: z = NODATA_value
+                if j == 4: z = NODATA_value # column
+                if i == 2 and j == 2: z = NODATA_value # random
+                if i == 5 and j == 1: z = NODATA_value
+                if i == 1: z = NODATA_value # row
+                if i == 3 and j == 1: z = NODATA_value # two pts/row
+                if i == 3 and j == 3: z = NODATA_value
+
                 
                 if z <> NODATA_value: