threaded error surface plotting

[imago.git] / gridf.py

diff --git a/gridf.py b/gridf.py
index 83a9771..51b0266 100644 (file)
--- a/gridf.py
+++ b/gridf.py
@@ -3,6 +3,7 @@ import Image, ImageDraw, ImageFilter
 from manual import lines as g_grid, l2ad, intersection, line as g_line
 from intrsc import intersections_from_angl_dist
 from linef import line_from_angl_dist
 from manual import lines as g_grid, l2ad, intersection, line as g_line
 from intrsc import intersections_from_angl_dist
 from linef import line_from_angl_dist

+import pcf

 
 class GridFittingFailedError(Exception):
     pass
 
 class GridFittingFailedError(Exception):
     pass


@@ -15,7 +16,7 @@ class MyGaussianBlur(ImageFilter.Filter):
     def filter(self, image):
         return image.gaussian_blur(self.radius)
 
     def filter(self, image):
         return image.gaussian_blur(self.radius)
 

-class V():
+class V(object):

     def __init__(self, x, y):
         self.x = x
         self.y = y
     def __init__(self, x, y):
         self.x = x
         self.y = y


@@ -29,17 +30,104 @@ class V():
     def __rmul__(self, other):
         return V(other * self.x, other * self.y)
 
     def __rmul__(self, other):
         return V(other * self.x, other * self.y)
 

-    def t(self):
-        return (self.x, self.y)
+    def __len__(self):
+        return 2;

 
 

+    def __getitem__(self, key):
+        if key == 0:
+            return self.x
+        elif key == 1:
+            return self.y
+        elif type(key) != int:
+            raise TypeError("V indices must be integers") 
+        else:
+            raise KeyError("V index ({}) out of range".format(key))
+
+    def __iter__(self):
+        yield self.x
+        yield self.y
+
+    @property

     def normal(self):
         return V(-self.y, self.x)
 
 def projection(point, line, vector):
     def normal(self):
         return V(-self.y, self.x)
 
 def projection(point, line, vector):

-    n = vector.normal()
-    l2 = g_line(point.t(), (point + n).t())
-    return V(*intersection(l2, g_line(*line)))
+    return V(*intersection(g_line(point, point + vector.normal), g_line(*line)))

     
     

+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 sys
+    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 = []
+    s = 0.001
+    k = 200
+    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):
+        q_in.put(x)
+
+    q_in.join()
+
+    print time.time() - start
+
+    while True:
+        try:
+            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()
+    plt.imshow(Z, cmap=cm.gnuplot2, interpolation='bicubic', 
+               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]
 
 def find(lines, size, l1, l2, bounds, hough, do_something):
     a, b, c, d = [V(*a) for a in bounds]


@@ -51,10 +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

-    
+   

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


@@ -97,9 +188,10 @@ def find(lines, size, l1, l2, bounds, hough, do_something):
     return grid, grid_lines
 
 def get_grid(a, b, c, d, hough, size):
     return grid, grid_lines
 
 def get_grid(a, b, c, d, hough, size):

-    l1 = hough.lines_from_list([a.t(), b.t()])
-    l2 = hough.lines_from_list([c.t(), d.t()])
+    l1 = hough.lines_from_list([a, b])
+    l2 = hough.lines_from_list([c, d])

     c = intersections_from_angl_dist([l1, l2], size, get_all=True)
     c = intersections_from_angl_dist([l1, l2], size, get_all=True)

+    #TODO do something when a corner is outside the image

     corners = (c[0] + c[1])
     if len(corners) < 4:
         print l1, l2, c
     corners = (c[0] + c[1])
     if len(corners) < 4:
         print l1, l2, c


@@ -112,21 +204,22 @@ 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))
-    # GaussianBlur is undocumented class, may not work in future versions of PIL
+    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)
     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))

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

     return distance
 
 def combine(bg, fg):
     bg_l = bg.load()
     fg_l = fg.load()
     return distance
 
 def combine(bg, fg):
     bg_l = bg.load()
     fg_l = fg.load()

-    res = Image.new('L', fg.size)
-    res_l = res.load()
+    #res = Image.new('L', fg.size)
+    #res_l = res.load()

 
     score = 0
     area = 0
 
     score = 0
     area = 0


@@ -134,8 +227,9 @@ def combine(bg, fg):
     for x in xrange(fg.size[0]):
         for y in xrange(fg.size[1]):
             if fg_l[x, y]:
     for x in xrange(fg.size[0]):
         for y in xrange(fg.size[1]):
             if fg_l[x, y]:

-                res_l[x, y] = bg_l[x, y] * fg_l[x, y]
+                #res_l[x, y] = bg_l[x, y] * fg_l[x, y]

                 score +=  bg_l[x, y]
                 area += 1
 
                 score +=  bg_l[x, y]
                 area += 1
 

-    return res, float(score)/area
+    #return res, float(score)/area
+    return None, float(score)/area