generalized RANSAC

[imago.git] / src / gridf3.py

diff --git a/src/gridf3.py b/src/gridf3.py
index 693b8ee..5852115 100644 (file)
--- a/src/gridf3.py
+++ b/src/gridf3.py
@@ -172,9 +172,9 @@ def find(lines, size, l1, l2, bounds, hough, show_all, do_something, logger):
     points = [l.points for l in new_lines1]
 
     for trial in xrange(3):
-        line1, cons = ransac.estimate(points, 2, 800, Diagonal_model)
-        points2 = map(lambda l: [(p if not p in cons else None) for p in l], points)
-        line2, cons2 = ransac.estimate(points2, 2, 800, Diagonal_model)
+        model = Diagonal_model(points)
+        diag_lines = ransac.ransac_multi(2, points, 2, 800, model=model)
+        [(line1, cons), (line2, cons2)] = diag_lines
         center = intersection(line1, line2)
         data = sum(points, [])
         diag1 = Line(line1)