Changeset 841

Timestamp:

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

Author:

ole

Message:

 

Location:

inundation/ga/storm_surge/pyvolution

Files:

• least_squares.py (modified) (1 diff)
• test_least_squares.py (modified) (3 diffs)
• test_util.py (modified) (3 diffs)
• util.py (modified) (1 diff)

inundation/ga/storm_surge/pyvolution/least_squares.py

@@ -167 +167 @@
     #Reduce number of points a bit
     points = points[::reduction]
-    elevation = attributes['elevation'][::reduction]
+    elevation = attributes['elevation']  #Must be elevation
+    elevation = elevation[::reduction]
     
     if verbose: print 'Got %d data points' %len(points)

inundation/ga/storm_surge/pyvolution/test_least_squares.py

@@ -25 +25 @@
     def tearDown(self):
         pass
-
 
     def test_datapoint_at_centroid(self):
@@ -494 +493 @@
         FN = 'xyatest' + str(time.time()) + '.xya'
         fid = open(FN, 'w')
-        fid.write('%f %f %f %f\n' %(1,1,2,4) )
-        fid.write('%f %f %f %f\n' %(1,3,4,8) )
-        fid.write('%f %f %f %f\n' %(3,1,4,8) )          
+        fid.write(' %s \n' %('elevation'))        
+        fid.write('%f %f %f\n' %(1,1,2) )
+        fid.write('%f %f %f\n' %(1,3,4) )
+        fid.write('%f %f %f\n' %(3,1,4) )               
         fid.close()
         
@@ -502 +502 @@
                 pts2rectangular(FN, 4, 4, format = 'asc')
         
-        z1 = [2, 4]
-        z2 = [4, 8]
-        z3 = [4, 8]
+
         data_coords = [ [1,1], [1,3], [3,1] ]
-        z = [z1, z2, z3]
+        z = [2, 4, 4]
 
         ref = fit_to_mesh(points, triangles, data_coords, z)            
-        
+
+        #print attributes
+        #print ref
         assert allclose(attributes, ref)
 

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)

inundation/ga/storm_surge/pyvolution/util.py

@@ -335 +335 @@
             lines = lines[1:]
         else:
-            attribute_names = None
-    
-        points = []     
-        attributes = []
+            attribute_names = ['elevation']  #HACK
+
+        attributes = {}    
+        for key in attribute_names:
+            attributes[key] = []
+
+        points = []
         for line in lines:
             fields = line.strip().split()
             points.append( (float(fields[0]), float(fields[1])) )
-            attributes.append( [float(z) for z in fields[2:] ] )
+            for i, key in enumerate(attribute_names):
+                attributes[key].append( float(fields[2+i]) )
         
     return points, attributes