error surface -- multiprocessing

[imago.git] / gridf.py

diff --git a/gridf.py b/gridf.py
index 23e4d04..35bbc80 100644 (file)
--- a/gridf.py
+++ b/gridf.py
@@ -53,40 +53,52 @@ class V(object):
 
 def projection(point, line, vector):
     return V(*intersection(g_line(point, point + vector.normal), g_line(*line)))
 
 def projection(point, line, vector):
     return V(*intersection(g_line(point, point + vector.normal), g_line(*line)))

+
+def job(args):
+    X, Y, im_l, a, b, c, d, s, v1, k, hough, size = args
+    return [distance(im_l, 
+                     get_grid(a + X[y] * s * v1, 
+                              b + Y[y] * s * v1, 
+                              c, d, hough, size),
+                     size) for y in range(0,2 * k)]

     
     

-def error_surface(lines, a, b, c, d, hough, size, v1):
+def error_surface(im_l, a, b, c, d, hough, size, v1):

     import matplotlib.pyplot as plt
     from matplotlib import cm
     import matplotlib.pyplot as plt
     from matplotlib import cm

+    import multiprocessing

     import time
     import time

+    import sys

     import pickle
     import pickle

+

     X = []
     Y = []
     Z = []
     s = 0.001
     X = []
     Y = []
     Z = []
     s = 0.001

-    k = 200
+    k = 250

     for i in range(-k, k):
         X.append(range(-k, k))
         Y.append(2*k*[i])
     for i in range(-k, k):
         X.append(range(-k, k))
         Y.append(2*k*[i])

-        
+
+    tasks = [(X[x], Y[x], im_l, a, b, c, d, s, v1, k, hough, size) for x in xrange(0, 2 * k)]
+    #everything is passed by value here; can it somehow be passed by reference?
+
+    pool = multiprocessing.Pool(None)
+    

     start = time.time()
     start = time.time()

-    for x in range(0, 2*k):
-        try:
-            Z.append([distance(lines, get_grid(a + X[x][y] * s * v1, b + Y[x][y] * s * v1, 
-                                           c, d, hough, size),
-                              size) for y in range(0, 2* k)])
-        except Exception:
-            Z.append(Z[-1])
-        o = ((time.time() - start) * (2 * k - (x + 1))) / (60 * (x + 1))
-        print x + 1, "{0} h {1:2.2f} m".format(int(o) / 60, o % 60)
+    Z = pool.map(job, tasks, 1)
+    print time.time() - start
+

     s_file = open('surface' + str(k), 'w')
     pickle.dump((X, Y, Z), s_file)
     s_file.close()
     s_file = open('surface' + str(k), 'w')
     pickle.dump((X, Y, Z), s_file)
     s_file.close()

-    plt.imshow(Z, cmap=cm.gnuplot2, interpolation='bicubic', 
+    plt.imshow(Z, cmap=cm.jet, interpolation='bicubic', 

                origin='upper', extent=(-k, k, -k, k), aspect='equal')
     plt.colorbar()
 
     plt.show()
 
                origin='upper', extent=(-k, k, -k, k), aspect='equal')
     plt.colorbar()
 
     plt.show()
 

+    sys.exit()
+

 def find(lines, size, l1, l2, bounds, hough, do_something):
     a, b, c, d = [V(*a) for a in bounds]
     l1 = line_from_angl_dist(l1, size)
 def find(lines, size, l1, l2, bounds, hough, do_something):
     a, b, c, d = [V(*a) for a in bounds]
     l1 = line_from_angl_dist(l1, size)


@@ -97,18 +109,27 @@ def find(lines, size, l1, l2, bounds, hough, do_something):
     b = projection(b, l1, v1) 
     c = projection(c, l2, v2) 
     d = projection(d, l2, v2) 
     b = projection(b, l1, v1) 
     c = projection(c, l2, v2) 
     d = projection(d, l2, v2) 

+
+    im_l = Image.new('L', size)
+    dr_l = ImageDraw.Draw(im_l)
+    for line in sum(lines, []):
+        dr_l.line(line_from_angl_dist(line, size), width=1, fill=255)
+    im_l = im_l.filter(MyGaussianBlur(radius=50))
+    #GaussianBlur is undocumented class, may not work in future versions of PIL
+    im_l = im_l.tostring()
+
+    #error_surface(im_l, a, b, c, d, hough, size, v1)
+

     grid = get_grid(a, b, c, d, hough, size)
     grid = get_grid(a, b, c, d, hough, size)

-    dist = distance(lines, grid, size)
+    dist = distance(im_l, grid, size)

     print dist
     print dist

-
-    #error_surface(lines, a, b, c, d, hough, size, v1)
-    
+   

     s = 0.02
     while True:
         ts1 = [(s, 0), (-s, 0), (s, s), (-s, -s), (-s, s), (s, -s), (0, s),  (0, -s)]
         grids = [(get_grid(a + t[0] * v1, b + t[1] * v1, 
                            c, d, hough, size), t) for t in ts1]
     s = 0.02
     while True:
         ts1 = [(s, 0), (-s, 0), (s, s), (-s, -s), (-s, s), (s, -s), (0, s),  (0, -s)]
         grids = [(get_grid(a + t[0] * v1, b + t[1] * v1, 
                            c, d, hough, size), t) for t in ts1]

-        distances = [(distance(lines, grid, size), 
+        distances = [(distance(im_l, grid, size), 

                       grid, t) for grid, t in grids]
         distances.sort(reverse=True)
         if distances[0][0] > dist:
                       grid, t) for grid, t in grids]
         distances.sort(reverse=True)
         if distances[0][0] > dist:


@@ -128,7 +149,7 @@ def find(lines, size, l1, l2, bounds, hough, do_something):
         ts1 = [(s, 0), (-s, 0), (s, s), (-s, -s), (-s, s), (s, -s), (0, s),  (0, -s)]
         grids = [(get_grid(a, b, 
                            c + t[0] * v2, d + t[1] * v2, hough, size), t) for t in ts1]
         ts1 = [(s, 0), (-s, 0), (s, s), (-s, -s), (-s, s), (s, -s), (0, s),  (0, -s)]
         grids = [(get_grid(a, b, 
                            c + t[0] * v2, d + t[1] * v2, hough, size), t) for t in ts1]

-        distances = [(distance(lines, grid, size), 
+        distances = [(distance(im_l, grid, size), 

                       grid, t) for grid, t in grids]
         distances.sort(reverse=True)
         if distances[0][0] > dist:
                       grid, t) for grid, t in grids]
         distances.sort(reverse=True)
         if distances[0][0] > dist:


@@ -156,20 +177,15 @@ def get_grid(a, b, c, d, hough, size):
     grid = g_grid(corners)
     return grid
 
     grid = g_grid(corners)
     return grid
 

-def distance(lines, grid, size):
-    im_l = Image.new('L', size)
-    dr_l = ImageDraw.Draw(im_l)
-    for line in sum(lines, []):
-        dr_l.line(line_from_angl_dist(line, size), width=1, fill=255)
-    im_l = im_l.filter(MyGaussianBlur(radius=3))
-    #GaussianBlur is undocumented class, may not work in future versions of PIL
+def distance(im_l, grid, size):

     im_g = Image.new('L', size)
     dr_g = ImageDraw.Draw(im_g)
     for line in grid[0] + grid[1]:
         dr_g.line(line, width=1, fill=255)
     #im_g = im_g.filter(MyGaussianBlur(radius=3))
     im_g = Image.new('L', size)
     dr_g = ImageDraw.Draw(im_g)
     for line in grid[0] + grid[1]:
         dr_g.line(line, width=1, fill=255)
     #im_g = im_g.filter(MyGaussianBlur(radius=3))

+    #GaussianBlur is undocumented class, may not work in future versions of PIL

     #im_d, distance = combine(im_l, im_g)
     #im_d, distance = combine(im_l, im_g)

-    distance = pcf.combine(im_l.tostring(), im_g.tostring())
+    distance = pcf.combine(im_l, im_g.tostring())

     return distance
 
 def combine(bg, fg):
     return distance
 
 def combine(bg, fg):