threaded error surface plotting

diff --git a/gridf.py b/gridf.py
index 23e4d04..51b0266 100644 (file)
--- a/gridf.py
+++ b/gridf.py
@@ -57,8 +57,29 @@ def projection(point, line, vector):
 def error_surface(lines, a, b, c, d, hough, size, v1):
     import matplotlib.pyplot as plt
     from matplotlib import cm
 def error_surface(lines, a, b, c, d, hough, size, v1):
     import matplotlib.pyplot as plt
     from matplotlib import cm

+    import threading
+    import Queue

     import time
     import time

+    import sys

     import pickle
     import pickle

+
+    class Worker(threading.Thread):
+        def __init__(self, q_in, q_out, job):
+            threading.Thread.__init__(self)
+            self.q_in = q_in
+            self.q_out = q_out
+            self.job = job
+
+        def run(self):
+            while True:
+                x = self.q_in.get()
+                try:
+                    self.q_out.put((x, self.job(x)))
+                except Exception:
+                    pass
+                print x
+                self.q_in.task_done()
+

     X = []
     Y = []
     Z = []
     X = []
     Y = []
     Z = []


@@ -67,17 +88,36 @@ def error_surface(lines, a, b, c, d, hough, size, v1):
     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])

+
+    job = lambda x: [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)]
+
+    q_in = Queue.Queue()
+    q_out = Queue.Queue()
+    for i in range(4):
+        t = Worker(q_in, q_out, job)
+        t.daemon = True
+        t.start()

         
     start = time.time()
     for x in range(0, 2*k):
         
     start = time.time()
     for x in range(0, 2*k):

+        q_in.put(x)
+
+    q_in.join()
+
+    print time.time() - start
+
+    while True:

         try:
         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.append(q_out.get_nowait())
+        except Queue.Empty:
+            break
+
+    Z.sort()
+    Z = [t for (x, t) in Z]
+

     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()


@@ -87,6 +127,8 @@ def error_surface(lines, a, b, c, d, hough, size, v1):
 
     plt.show()
 
 
     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,12 +139,13 @@ 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) 

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

     grid = get_grid(a, b, c, d, hough, size)
     dist = distance(lines, grid, size)
     print dist
     grid = get_grid(a, b, c, d, hough, size)
     dist = distance(lines, grid, size)
     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)]
     s = 0.02
     while True:
         ts1 = [(s, 0), (-s, 0), (s, s), (-s, -s), (-s, s), (s, -s), (0, s),  (0, -s)]


@@ -161,7 +204,7 @@ def distance(lines, grid, 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)
     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))
+    im_l = im_l.filter(MyGaussianBlur(radius=15))

     #GaussianBlur is undocumented class, may not work in future versions of PIL
     im_g = Image.new('L', size)
     dr_g = ImageDraw.Draw(im_g)
     #GaussianBlur is undocumented class, may not work in future versions of PIL
     im_g = Image.new('L', size)
     dr_g = ImageDraw.Draw(im_g)