Improc ass1: Finished assignment.

improc/ass1/linfilters.py

-from numpy import empty, array, minimum, maximum, meshgrid, ix_, arange, \
-        correlate
+from numpy import empty, array, minimum, maximum, meshgrid, ix_, arange
+from scipy.ndimage import correlate
 
 def linfilter1(f, w):
     g = empty(f.shape, dtype=f.dtype)

improc/ass1/timer.py

@@ -8,7 +8,7 @@ repeat = 1
 w = (3, 11)
 
 f = zoom(imread('cameraman.png'), .25)
-methods = [linfilter1, linfilter2, linfilter3]#, linfilter4]
+methods = [linfilter1, linfilter2, linfilter3, linfilter4]
 timings = [[] for i in methods]
 
 x = range(w[0], w[1] + 1, 2)