X-Git-Url: http://git.tomasm.cz/imago.git/blobdiff_plain/841662dc25b40dce151a0bf7a024e55682028f18..10a55cad0b75c18157aa2044a7d781778d51f9b8:/src/intrsc.py?ds=sidebyside

diff --git a/src/intrsc.py b/src/intrsc.py
index 1d4dd67..cbf922a 100644
--- a/src/intrsc.py
+++ b/src/intrsc.py
@@ -8,6 +8,7 @@ import ImageDraw
 import filters
 import k_means
 import output
+import linef
 
 def dst(line):
     """Return normalized line."""
@@ -27,6 +28,7 @@ def dst_sort(lines):
 def board(image, lines, show_all, do_something):
     """Compute intersections, find stone colors and return board situation."""
     # TODO refactor show_all, do_something
+    # TODO refactor this into smaller functions
     lines = [dst_sort(l) for l in lines]
     intersections = intersections_from_angl_dist(lines, image.size)
 
@@ -72,7 +74,6 @@ def board(image, lines, show_all, do_something):
 
     clusters = k_means.cluster(3, 2,zip(zip(luma, saturation), range(len(luma))),
                                [[0., 0.5], [0.5, 0.5], [1., 0.5]])
-   #clusters.sort(key=mean_luma)
 
     if show_all:
         fig = pyplot.figure(figsize=(8, 6))
@@ -115,46 +116,65 @@ def mean_luma(cluster):
     """Return mean luma of the *cluster* of points."""
     return sum(c[0][0] for c in cluster) / float(len(cluster))
 
+def to_general(line, size):
+    # TODO comment
+    (x1, y1), (x2, y2) = linef.line_from_angl_dist(line, size)
+    return (y2 - y1, x1 - x2, x2 * y1 - x1 * y2)
+
+def intersection(l1, l2):
+    a1, b1, c1 = l1
+    a2, b2, c2 = l2
+    delim = float(a1 * b2 - b1 * a2)
+    x = (b1 * c2 - c1 * b2) / delim
+    y = (c1 * a2 - a1 * c2) / delim
+    return x, y
+
 def intersections_from_angl_dist(lines, size, get_all=True):
     """Take grid-lines and size of the image. Return intersections."""
+    lines1 = map(lambda l: to_general(l, size), lines[1])
+    lines0 = map(lambda l: to_general(l, size), lines[0])
     intersections = []
-    for (angl1, dist1) in lines[1]:
+    for l1 in lines1:
         line = []
-        for (angl2, dist2) in lines[0]:
-            if abs(angl1 - angl2) > 0.4:
-                i_x =  (- ((dist2 / cos(angl2)) - (dist1 / cos(angl1))) 
-                        / (tan(angl1) - tan(angl2)))
-                i_y = (tan(angl1) * i_x) - (dist1 / cos(angl1))
-                if get_all or (-size[0] / 2 < i_x < size[0] / 2 and 
-                    -size[1] / 2 < i_y < size[1] / 2):
-                    line.append((int(i_x + size[0] / 2),
-                                 int(i_y + size[1] / 2)))
+        for l2 in lines0:
+            line.append(intersection(l1, l2))
         intersections.append(line)
     return intersections
    
-def RGBtoSat(c):
-    """Using the HSI color model."""
-    max_diff = max(c) - min(c)
+def rgb2lumsat(color):
+    """Convert RGB to luma and HSI model saturation."""
+    r, g, b = color
+    luma = (0.30 * r + 0.59 * g + 0.11 * b) / 255.0
+    max_diff = max(color) - min(color)
     if max_diff == 0:
-        return 0
+        saturation = 0
+    else:
+        saturation = 1. - ((3. * min(color)) / sum(color)) 
+    return luma, saturation
+
+def median(lst):
+    #TODO comment (or delete maybe?)
+    len_lst = len(lst)
+    if len_lst % 2 == 0:
+        return (lst[len_lst / 2] + lst[len_lst / 2 + 1]) / 2.0
     else:
-        return 1. - ((3. * min(c)) / sum(c)) 
+        return lst[len_lst / 2]
 
 def stone_color_raw(image, (x, y)):
     """Given image and coordinates, return stone color."""
     size = 3 
-    suma = []
-    t = 0
+    points = []
     for i in range(-size, size + 1):
         for j in range(-size, size + 1):
             try:
-                suma.append(image.getpixel((x + i, y + j)))
-                t += 1
+                points.append(image.getpixel((x + i, y + j)))
             except IndexError:
                 pass
-    luma = sum([0.30 * sum(s[0] for s in suma) / t, 0.59 * sum(s[1] for s in suma) / t, 
-            0.11 * sum(s[2] for s in suma) / t]) / 255.
-    saturation = sum(RGBtoSat(s) for s in suma) / t
-    color = [sum(s[0] for s in suma) / t, sum(s[1] for s in suma) / t,
-             sum(s[2] for s in suma) / t]
+    norm = float(len(points))
+    if norm == 0:
+        return 0, 0, (0, 0, 0) #TODO trow exception here
+    color = (sum(p[0] for p in points) / norm,
+             sum(p[1] for p in points) / norm,
+             sum(p[2] for p in points) / norm)
+    luma, saturation = rgb2lumsat(color)
     return luma, saturation, color