Cleaning, micro-optimizations.

[master-thesis.git] / Parasitemia / Parasitemia / MatchingEllipses.fs

diff --git a/Parasitemia/Parasitemia/MatchingEllipses.fs b/Parasitemia/Parasitemia/MatchingEllipses.fs
index 8a1b4f8..2022c26 100644 (file)
--- a/Parasitemia/Parasitemia/MatchingEllipses.fs
+++ b/Parasitemia/Parasitemia/MatchingEllipses.fs
@@ -9,8 +9,10 @@ open Types
 open Utils
 
 
+// Do not take in account matching score below this when two ellipses are matched.
 let matchingScoreThreshold1 = 0.6
-let matchingScoreThreshold2 = 1.0
+
+let scaleOverlapTest = 0.8
 
 type private EllipseScoreFlaggedKd (matchingScore: float, e: Ellipse) =
     let mutable matchingScore = matchingScore
@@ -18,24 +20,32 @@ type private EllipseScoreFlaggedKd (matchingScore: float, e: Ellipse) =
     member this.Ellipse = e
 
     member this.MatchingScore = matchingScore
+
     member this.AddMatchingScore(score: float) =
         matchingScore <- matchingScore + score
 
     member val Processed = false with get, set
     member val Removed = false with get, set
 
-    interface KdTree.I2DCoords with    
+    interface KdTree.I2DCoords with
         member this.X = this.Ellipse.Cx
         member this.Y = this.Ellipse.Cy
 
-        
+
 type MatchingEllipses (radiusMin: float) =
     let ellipses = List<EllipseScoreFlaggedKd>()
-        
-    member this.Add (e: Ellipse) = 
+
+    // All ellipses with a score below this are removed.
+    let matchingScoreThreshold2 = 20. * radiusMin
+
+    member this.Add (e: Ellipse) =
         ellipses.Add(EllipseScoreFlaggedKd(0.0, e))
 
     member this.Ellipses : Ellipse list =
+        List.ofSeq ellipses |> List.map (fun e -> e.Ellipse)
+
+    // Process all ellipses and return ellipses ordered from the best score to the worst.
+    member this.PrunedEllipses : Ellipse list =
         if ellipses.Count = 0
         then
             []
@@ -43,13 +53,13 @@ type MatchingEllipses (radiusMin: float) =
             // 1) Create a kd-tree from the ellipses list.
             let tree = KdTree.Tree.BuildTree (List.ofSeq ellipses)
 
-            // 2) Compute the matching score of each ellipses.       
+            // 2) Compute the matching score of each ellipses.
             let windowSize = radiusMin
             for e in ellipses do
                 e.Processed <- true
                 let areaE = e.Ellipse.Area
                 let window = { KdTree.minX = e.Ellipse.Cx - windowSize / 2.0
-                               KdTree.maxX = e.Ellipse.Cx + windowSize / 2.0 
+                               KdTree.maxX = e.Ellipse.Cx + windowSize / 2.0
                                KdTree.minY = e.Ellipse.Cy - windowSize / 2.0
                                KdTree.maxY = e.Ellipse.Cy + windowSize / 2.0 }
                 for other in tree.Search window do
@@ -61,14 +71,14 @@ type MatchingEllipses (radiusMin: float) =
                             let matchingScore = 2.0 * commonArea / (areaE + areaOther)
                             if matchingScore >= matchingScoreThreshold1
                             then
-                                other.AddMatchingScore(matchingScore)
-                                e.AddMatchingScore(matchingScore)
+                                other.AddMatchingScore(matchingScore * e.Ellipse.Perimeter)
+                                e.AddMatchingScore(matchingScore * other.Ellipse.Perimeter)
                         | _ -> ()
 
             // 3) Sort ellipses by their score.
             ellipses.Sort(fun e1 e2 -> e2.MatchingScore.CompareTo(e1.MatchingScore))
 
-            // 4) Remove ellipses wich have a low score. 
+            // 4) Remove ellipses with a low score.
             let i = ellipses.BinarySearch(EllipseScoreFlaggedKd(matchingScoreThreshold2, Ellipse(0.0, 0.0, 0.0, 0.0, 0.0)),
                                           { new IComparer<EllipseScoreFlaggedKd> with
                                                 member this.Compare(e1, e2) = e2.MatchingScore.CompareTo(e1.MatchingScore) }) |> abs
@@ -84,18 +94,18 @@ type MatchingEllipses (radiusMin: float) =
                 if not e.Removed
                 then
                     let window = { KdTree.minX = e.Ellipse.Cx - e.Ellipse.A
-                                   KdTree.maxX = e.Ellipse.Cx + e.Ellipse.A 
+                                   KdTree.maxX = e.Ellipse.Cx + e.Ellipse.A
                                    KdTree.minY = e.Ellipse.Cy - e.Ellipse.A
                                    KdTree.maxY = e.Ellipse.Cy + e.Ellipse.A }
                     for other in tree.Search window do
                         if not other.Removed && other.MatchingScore < e.MatchingScore
-                        then            
-                            if e.Ellipse.Contains other.Ellipse.Cx other.Ellipse.Cy
+                        then
+                            if e.Ellipse.Scale(scaleOverlapTest).Contains other.Ellipse.Cx other.Ellipse.Cy
                             then
                                 other.Removed <- true
             ellipses.RemoveAll(fun e -> e.Removed) |> ignore
 
             List.ofSeq ellipses |> List.map (fun e -> e.Ellipse)
 
-        
+