Changeset 2660

Timestamp:

Apr 5, 2006, 12:07:43 PM (18 years ago)

Author:

duncan

Message:

bug fix

Location:

inundation/fit_interpolate

Files:

• interpolate.py (modified) (3 diffs)
• test_interpolate.py (modified) (1 diff)

inundation/fit_interpolate/interpolate.py

@@ -229 +229 @@
                 start=0
                 # creating a dummy array to concatenate to.
-                z = zeros((0,2)) # 2 for points in 2D space
+                
+                f = ensure_numeric(f, Float)
+                z = zeros((0,f.shape[1]))
                 for end in range(start_blocking_len
                                  ,len(point_coordinates)
@@ -235 +237 @@
                     t = self.interpolate_block(f, point_coordinates[start:end],
                                                verbose=verbose)
+                    #print "t", t
+                    #print "z", z 
                     z = concatenate((z,t))
                     start = end
@@ -269 +273 @@
         #print "self.inside_poly_indices", self.inside_poly_indices
         #print "z", z
-        #print "z.size", z.size
         for i in self.outside_poly_indices: 
             z[i] = INF

inundation/fit_interpolate/test_interpolate.py

@@ -524 +524 @@
                       2*linear_function(point_coords) ]
             answer = transpose(answer)
+            #print "z",z
+            #print "answer",answer
+            assert allclose(z, answer)
+            
+        f = array([linear_function(vertices),2*linear_function(vertices),
+                   2*linear_function(vertices) - 100  ])
+        f = transpose(f)
+        #print "f",f
+        for blocking_max in range(len(point_coords)+2):
+        #if True:
+         #   blocking_max = 5
+            z = interp.interpolate(f, point_coords,
+                                   start_blocking_len=blocking_max)
+            answer = array([linear_function(point_coords),
+                      2*linear_function(point_coords) ,
+                      2*linear_function(point_coords)-100 ])
+            z = transpose(z)
             #print "z",z
             #print "answer",answer