better grid optimization

[imago.git] / gridf.py

diff --git a/gridf.py b/gridf.py
index 51b0266..6f044f1 100644 (file)
--- a/gridf.py
+++ b/gridf.py
@@ -1,5 +1,8 @@
+import multiprocessing
+

 import Image, ImageDraw, ImageFilter
 
 import Image, ImageDraw, ImageFilter
 

+from geometry import V

 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


@@ -16,120 +19,26 @@ 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(object):
-    def __init__(self, x, y):
-        self.x = x
-        self.y = y
-    
-    def __add__(self, other):
-        return V(self.x + other.x, self.y + other.y)
-
-    def __sub__(self, other):
-        return V(self.x - other.x, self.y - other.y)
-
-    def __rmul__(self, other):
-        return V(other * self.x, other * 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):
     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 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):
+def job_br1(args):
+    X, Y, im_l, a, b, c, d, s, v1, v2, 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), a + X[y] * s * v1, b + Y[y] * s * v1) for y in range(2 *k)]
+
+def job_br2(args):
+    X, Y, im_l, a, b, c, d, s, v1, v2, k, hough, size = args
+    return [(distance(im_l, 
+                     get_grid(a, b, c + X[y] * s * v2, 
+                              d + Y[y] * s * v2, 
+                              hough, size),
+                     size), c + X[y] * s * v2, d + Y[y] * s * v2) for y in range(2 *k)]
+
+def find(lines, size, l1, l2, bounds, hough, do_something, im_h):

     a, b, c, d = [V(*a) for a in bounds]
     l1 = line_from_angl_dist(l1, size)
     l2 = line_from_angl_dist(l2, size)
     a, b, c, d = [V(*a) for a in bounds]
     l1 = line_from_angl_dist(l1, size)
     l2 = line_from_angl_dist(l2, size)


@@ -140,29 +49,87 @@ def find(lines, size, l1, l2, bounds, hough, do_something):
     c = projection(c, l2, v2) 
     d = projection(d, l2, v2) 
 
     c = projection(c, l2, v2) 
     d = projection(d, l2, v2) 
 

-    #error_surface(lines, a, b, c, d, hough, size, v1)
+    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=30))
+    #GaussianBlur is undocumented class, may not work in future versions of PIL
+    #im_l = im_l.tostring()
+    im_l = im_h.tostring() # hocus pocus
+
+    #from gridf_analyzer import error_surface
+    #error_surface(im_l, a, b, c, d, hough, size, v1 ,v2)

 
     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)
+    
+    #let's try the bruteforce aproach:
+    s = 0.001
+    k = 50
+    X, Y = [], []
+    for i in range(-k, k):
+        X.append(range(-k, k))
+        Y.append(2*k*[i])
+
+    pool = multiprocessing.Pool(None)
+
+    tasks = [(X[x], Y[x], im_l, a, b, c, d, s, v1, v2, k, hough, size) for x in xrange(0, 2 * k)]
+
+    #start = time.time()
+    opt_ab = pool.map(job_br1, tasks, 1)
+    opt_cd = pool.map(job_br2, tasks, 1)
+    an, bn, cn, dn = 4 * [0]
+    d1 = 0
+    for lst in opt_ab:
+        for tpl in lst:
+            if tpl[0] > d1:
+                d1 = tpl[0]
+                a, b = tpl[1], tpl[2]
+    d1 = 0
+    for lst in opt_cd:
+        for tpl in lst:
+            if tpl[0] > d1:
+                d1 = tpl[0]
+                c, d = tpl[1], tpl[2]
+    #print time.time() - start
+    grid = get_grid(a, b, c, d, hough, size) 
+    grid_lines = [[l2ad(l, size) for l in grid[0]], [l2ad(l, size) for l in grid[1]]]
+    return grid, grid_lines
+
+    #old optimization experiments: 

     print dist
    
     print dist
    

-    s = 0.02
-    while True:
-        ts1 = [(s, 0), (-s, 0), (s, s), (-s, -s), (-s, s), (s, -s), (0, s),  (0, -s)]
+    path = [(0,0)] #MNTR
+    s = 0.01
+    for _ in range(10):
+        ts1 = [(s, 0), (0, s), (-s, 0), (0, -s)]

         grids = [(get_grid(a + t[0] * v1, b + t[1] * v1, 
                            c, d, hough, size), t) for t in ts1]
         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), 
-                      grid, t) for grid, t in grids]
-        distances.sort(reverse=True)
-        if distances[0][0] > dist:
-            dist = distances[0][0]
-            grid = distances[0][1]
-            t = distances[0][2]
-            a, b = a + t[0] * v1, b + t[1] * v1
-            print dist
-            s *= 0.75
-        else: 
-           break
+        distances = [distance(im_l, grid, size) for (grid, t) in grids]
+        gradient = [(di - dist) for di in distances]
+        gradient = [gradient[0] - gradient[2], gradient[1] - gradient[3]]
+        norm = (gradient[0] ** 2 + gradient[1] ** 2) ** 0.5
+        gradient = [g / (100 * norm) for g in gradient]
+        path.append(gradient)
+        a, b = a + gradient[0] * v1, b + gradient[1] * v1
+        dist = distance(im_l, grid, size)
+        print dist
+
+    ###MNTR
+    import matplotlib.pyplot as plt
+    from matplotlib import cm
+    import pickle
+
+    X, Y, Z = pickle.load(open('surface250'))
+
+    plt.imshow(Z, cmap=cm.jet, interpolation='none', 
+               origin='upper', extent=(-0.250, 0.250, -0.250, 0.250), aspect='equal')
+    plt.colorbar()
+    plt.plot([y for (x, y) in path], [x for (x, y) in path], 'go-')
+
+    plt.show()
+    ###MNTR

 
     print "---"
 
 
     print "---"
 


@@ -171,7 +138,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:


@@ -199,20 +166,24 @@ 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=15))
-    #GaussianBlur is undocumented class, may not work in future versions of PIL
+def line_out(line, size):
+    for p in line:
+        if p[0] < 0 or p[0] > size[0] or p[1] < 0 or p[1] > size[1]:
+            return True
+    else:
+        return False
+
+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 = 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)

+        if line_out(line, size):
+            return 0

     #im_g = im_g.filter(MyGaussianBlur(radius=3))
     #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):