From 05a2c37fb3f522545dd86f34ea9c1469d93002a9 Mon Sep 17 00:00:00 2001 From: Tomas Musil Date: Thu, 3 Jul 2014 02:46:15 +0200 Subject: [PATCH] fix bugs in gridf3 --- src/gridf3.py | 6 ++++-- src/ransac.py | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gridf3.py b/src/gridf3.py index bdf3a82..89c24a9 100644 --- a/src/gridf3.py +++ b/src/gridf3.py @@ -69,6 +69,9 @@ class Point: def __len__(self): return 2 + def to_tuple(self): + return (self.x, self.y) + class Line: def __init__(self, (a, b, c)): self.a, self.b, self.c = (a, b, c) @@ -103,7 +106,7 @@ def gen_corners(d1, d2): c2 = [p for p in d2.points if p in c1.l1.points][0] c3 = [p for p in d1.points if p in c2.l2.points][0] c4 = [p for p in d2.points if p in c3.l1.points][0] - yield [c1, c2, c3, c4] + yield map(lambda p: p.to_tuple(), [c1, c2, c3, c4]) def dst(p, l): (x, y), (a, b, c) = p, ransac.points_to_line(*l) @@ -115,7 +118,6 @@ def score(lines, points): s = min(map(lambda l: dst(p, l), lines)) s = min(s, 2) score += s - print score return score diff --git a/src/ransac.py b/src/ransac.py index 69d6177..4f0d9a0 100644 --- a/src/ransac.py +++ b/src/ransac.py @@ -66,7 +66,6 @@ def estimate(data, dist, k, modelClass=Linear_model): def ransac_duo(data, dist, k, mk, modelClass=Linear_model): cons = [] for i in xrange(mk): - print data, cons model, cons = estimate(set(data) - set(cons), dist, k, modelClass) return (model, cons), estimate(set(data) - set(cons), dist, k, modelClass) -- 2.4.2