X-Git-Url: http://git.tomasm.cz/imago.git/blobdiff_plain/33c8ac60f68f6ab030d894b208774505cab20ea8..ed2f10b265485040197402bbd5dbe0dd6058cb11:/src/ransac.py

diff --git a/src/ransac.py b/src/ransac.py
index 5d5d218..cc16d2f 100644
--- a/src/ransac.py
+++ b/src/ransac.py
@@ -52,19 +52,20 @@ def iterate(model, distance):
     score = float("inf")
     consensual = model.initial()
     estimate = model.get(consensual)
-    new_score, consensual = model.score(estimate, distance)
-    while (new_score < score):
-        score = new_score
-        try:
-            estimate = model.get(consensual)
-        except NP.linalg.LinAlgError:
-            pass
-        estimate = model.get(consensual)
-        new_score, consensual = model.score(estimate, distance)
+    new_score, new_consensual = model.score(estimate, distance)
+    if new_consensual != []:
+        while (new_score < score):
+            score, consensual = new_score, new_consensual
+            try:
+                estimate = model.get(consensual)
+                new_score, new_consensual = model.score(estimate, distance)
+            except (NP.linalg.LinAlgError):
+                pass
     return score, estimate, consensual
         
-def estimate(data, dist, k, modelClass=Linear_model):
-    model = modelClass(data)
+def estimate(data, dist, k, modelClass=Linear_model, model=None):
+    if not model:
+        model = modelClass(data)
     best = float("inf")
     estimate = None
     consensual = None
@@ -83,3 +84,14 @@ def ransac_duo(data, dist, k, mk, modelClass=Linear_model):
         model, cons = estimate(set(data) - set(cons), dist, k, modelClass)
     return (model, cons), estimate(set(data) - set(cons), dist, k, modelClass)
 
+def ransac_multi(m, data, dist, k, modelClass=Linear_model, model=None):
+    ests = []
+    cons = []
+    for i in xrange(m):
+        est, cons_new = estimate(None, dist, k, model=model)
+        model.remove(cons_new)
+        ests.append(est)
+    return ests
+
+        
+