preliminary work on generalized RANSAC

[imago.git] / src / manual.py

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]))