From: Tomas Musil Date: Sat, 14 Dec 2013 14:48:47 +0000 (+0100) Subject: do not reset X-Git-Url: http://git.tomasm.cz/imago.git/commitdiff_plain/6f2695aadaf3eee6de311b681b7cf54987777871?ds=sidebyside;hp=676b17ccc2d334fd2574bd26aef14c8381f6aaaa do not reset --- diff --git a/imago_pack/cs.py b/imago_pack/cs.py index 6273651..09d5280 100644 --- a/imago_pack/cs.py +++ b/imago_pack/cs.py @@ -71,6 +71,6 @@ def optimize(dimension, boundary, function_d, n_nest, n_turns, reset=1): for _ in xrange(n_turns / reset): next_turn(space) best_list.append((space.best_value, space.best)) - print space.best_value + # print space.best_value return max(best_list)[1] diff --git a/imago_pack/gridf.py b/imago_pack/gridf.py index 6a80c44..fe16f53 100644 --- a/imago_pack/gridf.py +++ b/imago_pack/gridf.py @@ -62,7 +62,7 @@ def find(lines, size, l1, l2, bounds, hough, show_all, do_something): 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 = Optimizer.optimize(4, 30, f_dist, 64, 256, 4) + x_v, y_v, x_h, y_h = Optimizer.optimize(4, 30, f_dist, 128, 512, 1) v1 = (v1[0] + x_v * delta_v, v1[1] + x_v) v2 = (v2[0] + y_v * delta_v, v2[1] + y_v)