grid -- naive optimalization

diff --git a/gridf.py b/gridf.py
index c8f4b90..17be372 100644 (file)
--- a/gridf.py
+++ b/gridf.py
@@ -1,8 +1,127 @@
+import Image, ImageDraw, ImageFilter
+

 from manual import lines as g_grid, l2ad
 from intrsc import intersections_from_angl_dist
 from manual import lines as g_grid, l2ad
 from intrsc import intersections_from_angl_dist

+from linef import line_from_angl_dist
+
+class GridFittingFailedError(Exception):
+    pass
+
+class MyGaussianBlur(ImageFilter.Filter):
+    name = "GaussianBlur"
+
+    def __init__(self, radius=2):
+        self.radius = radius
+    def filter(self, image):
+        return image.gaussian_blur(self.radius)
+
+class V():
+    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 t(self):
+        return (self.x, self.y)
+
+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)
+    l2 = line_from_angl_dist(l2, size)
+    v1 = V(*l1[0]) - V(*l1[1])
+    v2 = V(*l2[0]) - V(*l2[1])
+    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)]
+        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

 
 

-def find(lines, size, l1, l2):
-    c = intersections_from_angl_dist(lines, size)
-    corners = [c[0][0], c[0][-1], c[-1][0], c[-1][-1]]
+    print "---"
+
+    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, b, 
+                           c + t[0] * v2, d + t[1] * v2, 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]
+            c, d = c + t[0] * v2, d + t[1] * v2
+            print dist
+            s *= 0.75
+        else:
+            break
+
+    grid_lines = [[l2ad(l, size) for l in grid[0]], [l2ad(l, size) for l in grid[1]]]
+    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()])
+    c = intersections_from_angl_dist([l1, l2], size, get_all=True)
+    corners = (c[0] + c[1])
+    if len(corners) < 4:
+        print l1, l2, c
+        raise GridFittingFailedError

     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
+    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_d, distance = combine(im_l, im_g)
+    return distance
+
+def combine(bg, fg):
+    bg_l = bg.load()
+    fg_l = fg.load()
+    res = Image.new('L', fg.size)
+    res_l = res.load()
+
+    score = 0
+    area = 0
+
+    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]
+                score +=  bg_l[x, y]
+                area += 1
+
+    return res, float(score)/area

diff --git a/imago.py b/imago.py
index 1e5166c..3fa4f6b 100755 (executable)
--- a/imago.py
+++ b/imago.py
@@ -63,8 +63,8 @@ def main():
             #TODO ask user to try again
             return 1
     else:
             #TODO ask user to try again
             return 1
     else:

-        lines = linef.find_lines(image, show_all, do_something, verbose)
-        grid = gridf.find(lines, image.size, None, None)
+        lines, l1, l2, bounds, hough = linef.find_lines(image, show_all, do_something, verbose)
+        grid, lines = gridf.find(lines, image.size, l1, l2, bounds, hough, do_something)

         if show_all:
             im_g = image.copy()
             draw = ImageDraw.Draw(im_g)
         if show_all:
             im_g = image.copy()
             draw = ImageDraw.Draw(im_g)

diff --git a/intrsc.py b/intrsc.py
index 564faaa..cead665 100644 (file)
--- a/intrsc.py
+++ b/intrsc.py
@@ -21,7 +21,7 @@ def board(image, lines, show_all, do_something):
                       line])
     return board
 
                       line])
     return board
 

-def intersections_from_angl_dist(lines, size):
+def intersections_from_angl_dist(lines, size, get_all=False):

     intersections = []
     for (angl1, dist1) in sorted(lines[1], key=itemgetter(1)):
         line = []
     intersections = []
     for (angl1, dist1) in sorted(lines[1], key=itemgetter(1)):
         line = []


@@ -29,7 +29,7 @@ def intersections_from_angl_dist(lines, size):
             if abs(angl1 - angl2) > 0.4:
                 x =  - ((dist2 / cos(angl2)) - (dist1 / cos(angl1))) / (tan(angl1) - tan(angl2))
                 y = (tan(angl1) * x) - (dist1 / cos(angl1))
             if abs(angl1 - angl2) > 0.4:
                 x =  - ((dist2 / cos(angl2)) - (dist1 / cos(angl1))) / (tan(angl1) - tan(angl2))
                 y = (tan(angl1) * x) - (dist1 / cos(angl1))

-                if (-size[0] / 2 < x < size[0] / 2 and 
+                if get_all or (-size[0] / 2 < x < size[0] / 2 and 

                     -size[1] / 2 < y < size[1] / 2):
                     line.append((int(x + size[0] / 2), int(y + size[1] / 2)))
         intersections.append(line)
                     -size[1] / 2 < y < size[1] / 2):
                     line.append((int(x + size[0] / 2), int(y + size[1] / 2)))
         intersections.append(line)

diff --git a/linef.py b/linef.py
index 34c4d07..37690cc 100755 (executable)
--- a/linef.py
+++ b/linef.py
@@ -83,6 +83,7 @@ def find_lines(image, show_all, do_something, verbose):
     lines = []
     im_c = im_h2.convert('RGB').convert('RGB', (1, 0.5, 0.5, 0))
     draw_c = ImageDraw.Draw(im_c)
     lines = []
     im_c = im_h2.convert('RGB').convert('RGB', (1, 0.5, 0.5, 0))
     draw_c = ImageDraw.Draw(im_c)

+    bounds = []

 
     for line_l in lines_m:
         im_line = Image.new('L', im_h2.size)
 
     for line_l in lines_m:
         im_line = Image.new('L', im_h2.size)


@@ -96,6 +97,9 @@ def find_lines(image, show_all, do_something, verbose):
         for point in line_points:
             draw_c.point(point, fill=(120, 255, 120))
         lines.append(hough1.lines_from_list(line_points))
         for point in line_points:
             draw_c.point(point, fill=(120, 255, 120))
         lines.append(hough1.lines_from_list(line_points))

+        line_points = list(line_points)
+        line_points.sort()
+        bounds += [line_points[0], line_points[-1]]

 
     if show_all:
         do_something(im_c, "hough x lines")
 
     if show_all:
         do_something(im_c, "hough x lines")


@@ -107,7 +111,7 @@ def find_lines(image, show_all, do_something, verbose):
     if show_all:
         do_something(image_g, "lines")
    
     if show_all:
         do_something(image_g, "lines")
    

-    return lines
+    return lines, lines_m[0][0], lines_m[1][0], bounds, hough1

 
 def combine(image1, image2):
     im_l1 = image1.load()
 
 def combine(image1, image2):
     im_l1 = image1.load()

diff --git a/manual.py b/manual.py
index 1d06035..e60a848 100644 (file)
--- a/manual.py
+++ b/manual.py
@@ -65,8 +65,8 @@ def find_lines(im_orig):
                             for j in [3, 9, 15]:
                                 hoshi(intersection(line(l_vert[i][0], l_vert[i][1]),
                                                    line(l_hor[j][0], l_hor[j][1])))
                             for j in [3, 9, 15]:
                                 hoshi(intersection(line(l_vert[i][0], l_vert[i][1]),
                                                    line(l_hor[j][0], l_hor[j][1])))

-                        lines_r = [[l2ad(l[0], l[1], im.size) for l in l_vert], 
-                                   [l2ad(l[0], l[1], im.size) for l in l_hor]]
+                        lines_r = [[l2ad(l, im.size) for l in l_vert], 
+                                   [l2ad(l, im.size) for l in l_hor]]

 
         screen.display_picture(im)
         clock.tick(15)
 
         screen.display_picture(im)
         clock.tick(15)


@@ -139,7 +139,7 @@ def intersection(p, q):
     return (int(round(float(q[1] * p[2] - p[1] * q[2]) / det)), 
             int(round(float(p[0] * q[2] - q[0] * p[2]) / det)))
 
     return (int(round(float(q[1] * p[2] - p[1] * q[2]) / det)), 
             int(round(float(p[0] * q[2] - q[0] * p[2]) / det)))
 

-def l2ad(a, b, size):
+def l2ad((a, b), size):

     if (a[0] - b[0]) == 0:
         angle = pi / 2
     else:
     if (a[0] - b[0]) == 0:
         angle = pi / 2
     else: