k-means clustering

[imago.git] / gridf.py

diff --git a/gridf.py b/gridf.py
index e957880..3bb7c54 100644 (file)
--- a/gridf.py
+++ b/gridf.py
@@ -10,7 +10,7 @@ from manual import lines as g_grid
 from intrsc import intersections_from_angl_dist
 from linef import line_from_angl_dist
 import pcf
-import pso
+import cs as Optimizer
 
 class GridFittingFailedError(Exception):
     pass
@@ -30,7 +30,7 @@ def job_4(x, y, w, z, im_l, v1, v2, h1, h2, dv, dh, size):
     h2 = (h2[0] + z * dh, h2[1] + z)
     return (distance(im_l, get_grid([v1, v2], [h1, h2], size), size))
 
-def find(lines, size, l1, l2, bounds, hough, do_something, im_h):
+def find(lines, size, l1, l2, bounds, hough, show_all, do_something):
     l1 = line_from_angl_dist(l1, size)
     l2 = line_from_angl_dist(l2, size)
     v1 = V(*l1[0]) - V(*l1[1])
@@ -52,17 +52,17 @@ def find(lines, size, l1, l2, bounds, hough, do_something, im_h):
     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=5))
+    im_l = im_l.filter(MyGaussianBlur(radius=3))
     #GaussianBlur is undocumented class, may not work in future versions of PIL
     im_l_s = im_l.tostring()
 
-    import time
-    start = time.time()
+    #import time
+    #start = time.time()
 
     f_dist = partial(job_4, im_l=im_l_s, v1=v1, v2=v2, h1=h1, h2=h2,
                      dv=delta_v, dh=delta_h, size=size)
 
-    x_v, y_v, x_h, y_h = pso.optimize(4, 30, f_dist, 32, 1028)
+    x_v, y_v, x_h, y_h = Optimizer.optimize(4, 30, f_dist, 128, 256)
 
     v1 = (v1[0] + x_v * delta_v, v1[1] + x_v)
     v2 = (v2[0] + y_v * delta_v, v2[1] + y_v)
@@ -73,7 +73,7 @@ def find(lines, size, l1, l2, bounds, hough, do_something, im_h):
     grid_lines = [[l2ad(l, size) for l in grid[0]], 
                   [l2ad(l, size) for l in grid[1]]]
     
-    print time.time() - start
+    #print time.time() - start
     
 ### Show error surface
 #
@@ -82,20 +82,22 @@ def find(lines, size, l1, l2, bounds, hough, do_something, im_h):
 #                  delta_v, delta_h, x_v, y_v, x_h, y_h, size)
 ###
 
+    if show_all:
+
 ### Show grid over lines
 #
-    im_t = Image.new('RGB', im_l.size, None)
-    im_t_l = im_t.load()
-    im_l_l = im_l.load()
-    for x in xrange(im_t.size[0]):
-        for y in xrange(im_t.size[1]):
-            im_t_l[x, y] = (im_l_l[x, y], 0, 0)
-
-    im_t_d = ImageDraw.Draw(im_t)
-    for l in grid[0] + grid[1]:
-        im_t_d.line(l, width=1, fill=(0, 255, 0))
-
-    do_something(im_t, "lines and grid")
+        im_t = Image.new('RGB', im_l.size, None)
+        im_t_l = im_t.load()
+        im_l_l = im_l.load()
+        for x in xrange(im_t.size[0]):
+            for y in xrange(im_t.size[1]):
+                im_t_l[x, y] = (im_l_l[x, y], 0, 0)
+
+        im_t_d = ImageDraw.Draw(im_t)
+        for l in grid[0] + grid[1]:
+            im_t_d.line(l, width=1, fill=(0, 255, 0))
+
+        do_something(im_t, "lines and grid")
 ###
 
     return grid, grid_lines