X-Git-Url: http://git.tomasm.cz/imago.git/blobdiff_plain/92f288e8b33a67060a4553d8e71d618038885bf9..7f4334b61a001eb1a2df878f804a9f6771263709:/src/gridf2.py

diff --git a/src/gridf2.py b/src/gridf2.py
index 8e6936a..0d9246f 100644
--- a/src/gridf2.py
+++ b/src/gridf2.py
@@ -55,7 +55,7 @@ def score(grid, lines, limit):
     score = 0
     for line in lines:
         s = min(map(lambda g: abs(line[1] - g), ds))
-        s = min(s, 2)
+        s = min(s, 4)
         score += s
 
     return score
@@ -65,6 +65,28 @@ def lines2grid(lines, perp_l):
     f = lambda l: (gm.intersection(b1, l), gm.intersection(b2, l))
     return map(f, lines)
 
+def pertubations(grid, middle_l):
+    corners = [grid[0], grid[-1]]
+    for l in [0, 1]:
+        for c in [0, 1]:
+            for s in [0, 1]:
+                for x in [-1, 1]:
+                    sgrid = corners
+                    sgrid[l] = list(sgrid[l])
+                    sgrid[l][c] = list(sgrid[l][c])
+                    sgrid[l][c][s] += x
+                    try:
+                        middle = middle_l(sgrid)
+                        lh = (gm.intersection(sgrid[0], middle), gm.intersection(sgrid[1], middle))
+                        sgrid = ([sgrid[0]] +
+                             gm.fill(sgrid[0], sgrid[1], lh, 17) +
+                             [sgrid[1]])
+                    except ZeroDivisionError:
+                        continue
+
+                    yield sgrid
+
+
 def test(): 
     import pickle
     import matplotlib.pyplot as pyplot
@@ -88,31 +110,58 @@ def test():
     while True:
         t0 = time.time()
         sc1, gridv = 999999, None
-        for i in range(250):
-            l1s = random.sample(l1, 2)
-            l1s.sort(key=lambda l: l[1])
-            sgrid = map(lambda l:linef.line_from_angl_dist(l, size), l1s) 
-            middle = lambda m: ((m, 0),(m, 390))
-            middle = middle(gm.intersection((sgrid[0][0], sgrid[1][1]), 
-                                            (sgrid[0][1], sgrid[1][0]))[0])
-            lh = (gm.intersection(sgrid[0], middle), gm.intersection(sgrid[1], middle))
-            sc1_n, gridv_n = min(map(lambda g: (score(g, l1, 210), g), generate_models(sgrid, lh)))
-            if sc1_n < sc1:
-                sc1, gridv = sc1_n, gridv_n
-
         sc2, gridh = 999999, None
-        for i in range(250):
-            l2s = random.sample(l2, 2)
-            l2s.sort(key=lambda l: l[1])
-            sgrid = map(lambda l:linef.line_from_angl_dist(l, size), l2s) 
-            middle = lambda m: ((0, m),(520, m))
-            middle = middle(gm.intersection((sgrid[0][0], sgrid[1][1]), 
-                                            (sgrid[0][1], sgrid[1][0]))[1])
-            lh = (gm.intersection(sgrid[0], middle), gm.intersection(sgrid[1], middle))
-            sc2_n, gridh_n = min(map(lambda g: (score(g, l2, 275), g), generate_models(sgrid, lh)))
-            if sc2_n < sc2:
-                sc2, gridh = sc2_n, gridh_n
-        gridv, gridh = lines2grid(gridv, gridh), lines2grid(gridh, gridv)
+        sc1_n, sc2_n = 999999, 999999
+        gridv_n, gridh_n = None, None
+        for k in range(50):
+            for i in range(5):
+                l1s = random.sample(l1, 2)
+                l1s.sort(key=lambda l: l[1])
+                sgrid = map(lambda l:linef.line_from_angl_dist(l, size), l1s)
+                middle_l1 = lambda m: ((m, 0),(m, 390))
+                middle_l = lambda sgrid: middle_l1(gm.intersection((sgrid[0][0], sgrid[1][1]), 
+                                                (sgrid[0][1], sgrid[1][0]))[0])
+                middle = middle_l(sgrid)
+                lh = (gm.intersection(sgrid[0], middle), gm.intersection(sgrid[1], middle))
+                sc1_n, gridv_n = min(map(lambda g: (score(g, l1, 210), g), generate_models(sgrid, lh)))
+
+                p = True
+                while p:
+                    p = False
+                    for ng in pertubations(gridv_n, middle_l): # TODO randomize
+                        sc = score(ng, l1, 210)
+                        if sc < sc1_n:
+                            sc1_n, gridv_n = sc, ng
+                            p = True
+
+                if sc1_n < sc1:
+                    sc1, gridv = sc1_n, gridv_n
+
+            for i in range(5):
+                l2s = random.sample(l2, 2)
+                l2s.sort(key=lambda l: l[1])
+                sgrid = map(lambda l:linef.line_from_angl_dist(l, size), l2s) 
+                middle_l1 = lambda m: ((0, m),(520, m))
+                middle_l = lambda sgrid: middle_l1(gm.intersection((sgrid[0][0], sgrid[1][1]), 
+                                                (sgrid[0][1], sgrid[1][0]))[1])
+                middle = middle_l(sgrid)
+                lh = (gm.intersection(sgrid[0], middle), gm.intersection(sgrid[1], middle))
+                sc2_n, gridh_n = min(map(lambda g: (score(g, l2, 275), g), generate_models(sgrid, lh)))
+
+                p = True
+                while p:
+                    p = False
+                    for ng in pertubations(gridh_n, middle_l): # TODO randomize
+                        sc = score(ng, l2, 275)
+                        if sc < sc2_n:
+                            sc2_n, gridh = sc, ng
+                            p = True
+
+                if sc2_n < sc2:
+                    sc2, gridh = sc2_n, gridh_n
+
+            gridv, gridh = lines2grid(gridv, gridh), lines2grid(gridh, gridv)
+
         print time.time() - t0
         print sc1, sc2