Changeset 841 for inundation/ga/storm_surge/pyvolution/test_util.py

Timestamp:

Feb 7, 2005, 6:03:02 PM (20 years ago)

Author:

ole

Message:

 

File:

• inundation/ga/storm_surge/pyvolution/test_util.py (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/test_util.py

@@ -343 +343 @@
         FN = 'xyatest' + str(time.time()) + '.xya'
         fid = open(FN, 'w')
+        fid.write('      %s %s %s\n' %('a1', 'a2', 'a3') )        
         fid.write('%f %f %f %f %f\n' %(0,1,10,20,30) )
         fid.write('%f %f %f %f %f\n' %(1,0,30,20,10) )
@@ -348 +349 @@
         fid.close()
         
-        points, attributes, _ = read_xya(FN, format = 'asc')
-        
+        points, attributes = read_xya(FN, format = 'asc')
+
         assert allclose(points, [ [0,1], [1,0], [1,1] ])
-        assert allclose(attributes, [ [10,20,30], [30,20,10], 
-                [40.2,40.3,40.4] ])
+        assert allclose(attributes['a1'], [10,30,40.2])
+        assert allclose(attributes['a2'], [20,20,40.3])
+        assert allclose(attributes['a3'], [30,10,40.4])        
         
         os.remove(FN)
@@ -366 +368 @@
         fid.close()
         
-        points, attributes, attribute_names = read_xya(FN, format = 'asc')
-
-        assert attribute_names[0] == 'a1'
-        assert attribute_names[1] == 'a2'
-        assert attribute_names[2] == 'a3'        
+        points, attributes = read_xya(FN, format = 'asc')
+
         assert allclose(points, [ [0,1], [1,0], [1,1] ])
-        assert allclose(attributes, [ [10,20,30], [30,20,10], 
-                [40.2,40.3,40.4] ])
+
+        assert allclose(attributes['a1'], [10,30,40.2])
+        assert allclose(attributes['a2'], [20,20,40.3])
+        assert allclose(attributes['a3'], [30,10,40.4])        
+
         
         os.remove(FN)