X-Git-Url: http://git.tomasm.cz/imago.git/blobdiff_plain/ecb0ef2b5ea477ee170ce083f59d2200af7117a2..fb4d31c62744561af4bc3941d1cb9da430c5c64a:/gridf.py?ds=sidebyside

diff --git a/gridf.py b/gridf.py
index 58229a4..03e3014 100644
--- a/gridf.py
+++ b/gridf.py
@@ -5,12 +5,12 @@ from functools import partial
 
 import Image, ImageDraw, ImageFilter
 
-from geometry import V, projection
-from manual import lines as g_grid, l2ad
+from geometry import V, projection, l2ad
+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
@@ -52,7 +52,7 @@ 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()
 
@@ -62,7 +62,7 @@ def find(lines, size, l1, l2, bounds, hough, do_something, im_h):
     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)