Changeset 2061

Timestamp:

Nov 24, 2005, 11:21:18 AM (18 years ago)

Author:

ole

Message:

Smarter ASCII Write

Location:

inundation/pyvolution

Files:

• data_manager.py (modified) (3 diffs)
• test_data_manager.py (modified) (2 diffs)

inundation/pyvolution/data_manager.py

@@ -1476 +1476 @@
     """
 
-    from Numeric import array, Float, concatenate, NewAxis, zeros, reshape, sometrue 
+    import sys
+    from Numeric import array, Float, concatenate, NewAxis, zeros, reshape, sometrue
+    from Numeric import array2string
+    
     from utilities.polygon import inside_polygon
     from util import apply_expression_to_dictionary
@@ -1635 +1638 @@
 
 
-    from Numeric import zeros, Float
+
     grid_points = zeros ( (ncols*nrows, 2), Float )
 
@@ -1766 +1769 @@
                 print 'Doing row %d of %d' %(i, nrows)
 
-            base_index = (nrows-i-1)*ncols     
-            for j in range(ncols):
-                index = base_index+j
-
-                ascid.write('%f ' %grid_values[index])
-
-            ascid.write('\n')
+            base_index = (nrows-i-1)*ncols
+
+            slice = grid_values[base_index:base_index+ncols]
+            s = array2string(slice, max_line_width=sys.maxint)
+            ascid.write(s[1:-1] + '\n')
+
+            
+            #print
+            #for j in range(ncols):
+            #    index = base_index+j#
+            #    print grid_values[index],
+            #    ascid.write('%f ' %grid_values[index])
+            #ascid.write('\n')
 
         #Close

inundation/pyvolution/test_data_manager.py

@@ -1664 +1664 @@
         assert L[1].strip().lower() == '-9999'
 
-
         #Check grid values
         for j in range(5):
             L = lines[6+j].strip().split()
+            assert len(L) == 5
             y = (4-j) * cellsize
+
             for i in range(5):
+                #print i
                 if i+j >= 4:
                     assert allclose(float(L[i]), -i*cellsize - y)
@@ -3586 +3588 @@
 if __name__ == "__main__":
     #suite = unittest.makeSuite(Test_Data_Manager,'test_asc_csiro2sww4')
-    #suite = unittest.makeSuite(Test_Data_Manager,'test')
-    suite = unittest.makeSuite(Test_Data_Manager,'test_sww2dem_asc_missing_points')
+    suite = unittest.makeSuite(Test_Data_Manager,'test')
+    #suite = unittest.makeSuite(Test_Data_Manager,'test_sww2dem_asc_missing_points')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_sww2dem_boundingbox')    
     #suite = unittest.makeSuite(Test_Data_Manager,'test_dem2pts_bounding_box')