small refactoring

diff --git a/src/intrsc.py b/src/intrsc.py
index 1d4dd67..355468c 100644 (file)
--- a/src/intrsc.py
+++ b/src/intrsc.py
@@ -27,6 +27,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
 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)
 
     lines = [dst_sort(l) for l in lines]
     intersections = intersections_from_angl_dist(lines, image.size)
 


@@ -72,7 +73,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 = 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))
 
     if show_all:
         fig = pyplot.figure(figsize=(8, 6))


@@ -132,29 +132,38 @@ def intersections_from_angl_dist(lines, size, get_all=True):
         intersections.append(line)
     return intersections
    
         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:
     if max_diff == 0:

-        return 0
+        saturation = 0

     else:
     else:

-        return 1. - ((3. * min(c)) / sum(c)) 
+        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 lst[len_lst / 2]

 
 def stone_color_raw(image, (x, y)):
     """Given image and coordinates, return stone color."""
     size = 3 
 
 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:
     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
             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))
+    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
     return luma, saturation, color

diff --git a/src/manual.py b/src/manual.py
index f6f3807..8e246d4 100644 (file)
--- a/src/manual.py
+++ b/src/manual.py
@@ -82,8 +82,8 @@ def lines(corners):
               sqrt(b[0] **2 + b[1] ** 2)), a[0] * b[1] - b[0] * a[1], c) for a, b, c in cor_d]
     cor_d = sorted([(copysign(acos(min(a, 1)), b), c) for a, b, c in cor_d])
     corners = [corners[0]] + [c for _, c in cor_d]
               sqrt(b[0] **2 + b[1] ** 2)), a[0] * b[1] - b[0] * a[1], c) for a, b, c in cor_d]
     cor_d = sorted([(copysign(acos(min(a, 1)), b), c) for a, b, c in cor_d])
     corners = [corners[0]] + [c for _, c in cor_d]

-    return (_lines(corners, 0) + [(corners[0], corners[3]),
-                                  (corners[1], corners[2])],
+    return (_lines(corners, 0) + 
+            [(corners[0], corners[3]), (corners[1], corners[2])],

             _lines(corners[1:4] + [corners[0]], 0) + 
             [(corners[0], corners[1]), (corners[2], corners[3])])
 
             _lines(corners[1:4] + [corners[0]], 0) + 
             [(corners[0], corners[1]), (corners[2], corners[3])])
 


@@ -91,8 +91,8 @@ def _lines(corners, n):
     # TODO what is this?
     if n == 0:
         x = half_line(corners)
     # TODO what is this?
     if n == 0:
         x = half_line(corners)

-        return (_lines([corners[0], x[0], x[1], corners[3]], n + 1) + [x] + 
-                _lines([x[0], corners[1], corners[2], x[1]], n + 1))
+        return (_lines([corners[0], x[0], x[1], corners[3]], 1) + [x] + 
+                _lines([x[0], corners[1], corners[2], x[1]], 1))

     else:
         x = half_line(corners)
         c = intersection(line(x[0], corners[2]), line(corners[1], corners[3]))
     else:
         x = half_line(corners)
         c = intersection(line(x[0], corners[2]), line(corners[1], corners[3]))