Changeset 2514


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • inundation/pyvolution/data_manager.py

    r2512 r2514  
    11291129    import os
    11301130    from Scientific.IO.NetCDF import NetCDFFile
    1131     from Numeric import Float, zeros, reshape
     1131    from Numeric import Float, zeros, reshape, sum
    11321132
    11331133    root = basename_in
     
    12021202    nn = 0
    12031203    no_counts = []
    1204     print 'I think NODATA_values is:    ', NODATA_value
    12051204    for i in range(nrows):
    1206         v = [dem_elevation_r[i,:]]
    1207         this_count = v.count(NODATA_value)
    1208         nn = nn + this_count
     1205        v = dem_elevation_r[i,:]
     1206        this_count = sum(v == NODATA_value)
     1207        nn += this_count
    12091208        no_counts.append(this_count)
    12101209
  • inundation/pyvolution/test_data_manager.py

    r2507 r2514  
    797797                x = j*25.0
    798798                z = x+2*y
    799                 #if j == 4: z = NODATA_value
    800                 #if i == 1 and j == 2: z = NODATA_value
    801                 #if i == 2 and j == 4: z = NODATA_value
    802                 #if i == 3 and j == 3: z = NODATA_value
    803                 #if i == 5 and j == 1: z = NODATA_value
    804                 if i == 0 and j == 0: z = NODATA_value
    805                 if i == 0 and j == 1: z = NODATA_value
    806                 if i == 0 and j == 2: z = NODATA_value
     799                if j == 4: z = NODATA_value # column
     800                if i == 2 and j == 2: z = NODATA_value # random
     801                if i == 5 and j == 1: z = NODATA_value
     802                if i == 1: z = NODATA_value # row
     803                if i == 3 and j == 1: z = NODATA_value # two pts/row
     804                if i == 3 and j == 3: z = NODATA_value
     805
    807806               
    808807                if z <> NODATA_value:
Note: See TracChangeset for help on using the changeset viewer.