X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FMatchingEllipses.fs;h=03a3869012f51047ddadc7a0faf2e905de72fcaf;hp=4cc3d2ba891b4120d2b369a6d44c3227d9c1b0c9;hb=2d712781def419c9acc98368f7102b19b064f16d;hpb=170abb893b9e6babbf93276e39e8c984cedbc68f diff --git a/Parasitemia/ParasitemiaCore/MatchingEllipses.fs b/Parasitemia/ParasitemiaCore/MatchingEllipses.fs index 4cc3d2b..03a3869 100644 --- a/Parasitemia/ParasitemiaCore/MatchingEllipses.fs +++ b/Parasitemia/ParasitemiaCore/MatchingEllipses.fs @@ -9,14 +9,21 @@ open System.Collections.Generic open Types open Utils -type private EllipseScoreFlaggedKd (matchingScore: float32, e: Ellipse) = +// All ellipses with a score below this are removed. +let matchingScoreThresholdPerRadiusUnit = 0.07f // For a radius of 1. // 0.25 +let matchingScorePower = 20.f +let windowSizeRadiusFactor = 1.f / 2.f // Used when searching for neighbor ellipses. +let minimumDistanceFromCenterRadiusFactor = 1.f / 3.f +let minimumAreaFactor = 1.1f + +type private EllipseScoreFlaggedKd (matchingScore : float32, e : Ellipse) = let mutable matchingScore = matchingScore member this.Ellipse = e member this.MatchingScore = matchingScore - member this.AddMatchingScore (score: float32) = + member this.AddMatchingScore (score : float32) = matchingScore <- matchingScore + score member val Processed = false with get, set @@ -26,75 +33,74 @@ type private EllipseScoreFlaggedKd (matchingScore: float32, e: Ellipse) = member this.X = this.Ellipse.Cx member this.Y = this.Ellipse.Cy -type MatchingEllipses (radius: float32) = - let ellipses = List() +type MatchingEllipses (radius : float32) = + let ellipses = List () - // All ellipses with a score below this are removed. - let matchingScoreThreshold = 0.4f - - member this.Add (e: Ellipse) = - ellipses.Add(EllipseScoreFlaggedKd(0.f, e)) + member this.Add (e : Ellipse) = + ellipses.Add (EllipseScoreFlaggedKd (0.f, e)) member this.Ellipses : Ellipse list = List.ofSeq ellipses |> List.map (fun e -> e.Ellipse) member this.PrunedEllipses : Ellipse list = - if ellipses.Count = 0 - then + if ellipses.Count = 0 then [] else // 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. - let windowSize = radius / 2.f + let windowSize = radius * windowSizeRadiusFactor for e in ellipses do e.Processed <- true let areaE = e.Ellipse.Area - let window = { KdTree.minX = e.Ellipse.Cx - windowSize / 2.f - KdTree.maxX = e.Ellipse.Cx + windowSize / 2.f - KdTree.minY = e.Ellipse.Cy - windowSize / 2.f - KdTree.maxY = e.Ellipse.Cy + windowSize / 2.f } + let window = + { + KdTree.minX = e.Ellipse.Cx - windowSize / 2.f + KdTree.maxX = e.Ellipse.Cx + windowSize / 2.f + KdTree.minY = e.Ellipse.Cy - windowSize / 2.f + KdTree.maxY = e.Ellipse.Cy + windowSize / 2.f + } for other in tree.Search window do - if not other.Processed - then + if not other.Processed then let areaOther = other.Ellipse.Area match EEOver.EEOverlapArea e.Ellipse other.Ellipse with | Some (overlapArea, _, _) // Because of approximation error, see https://github.com/chraibi/EEOver/issues/4 when overlapArea - areaE < 1.f && overlapArea - areaOther < 1.f -> - let matchingScore = (2.f * overlapArea / (areaE + areaOther)) ** 30.f - other.AddMatchingScore(matchingScore) - e.AddMatchingScore(matchingScore) + let matchingScore = (2.f * overlapArea / (areaE + areaOther)) ** matchingScorePower + other.AddMatchingScore matchingScore + e.AddMatchingScore matchingScore | _ -> () // 3) Remove ellipses whose center is near the center of another ellipse with a better score. + let matchingScoreThreshold = matchingScoreThresholdPerRadiusUnit * radius for e in ellipses do - if e.MatchingScore < matchingScoreThreshold - then + if e.MatchingScore < matchingScoreThreshold then e.Removed <- true else - let window = { KdTree.minX = 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 } + let window = + { + KdTree.minX = 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 && e.MatchingScore > other.MatchingScore - then + if not other.Removed && e.MatchingScore > other.MatchingScore then // Case where ellipses are too close. - if distanceTwoPoints (PointF(e.Ellipse.Cx, e.Ellipse.Cy)) (PointF(other.Ellipse.Cx, other.Ellipse.Cy)) < 0.3f * e.Ellipse.B - then + if distanceTwoPoints (PointF (e.Ellipse.Cx, e.Ellipse.Cy)) (PointF (other.Ellipse.Cx, other.Ellipse.Cy)) < minimumDistanceFromCenterRadiusFactor * e.Ellipse.B then other.Removed <- true else // Case where ellipses are overlapped. match EEOver.EEOverlapArea e.Ellipse other.Ellipse with - | Some (overlapArea, _, _) when e.Ellipse.Area < 1.1f * overlapArea || other.Ellipse.Area < 1.1f * overlapArea -> + | Some (overlapArea, _, _) when e.Ellipse.Area < minimumAreaFactor * overlapArea || other.Ellipse.Area < minimumAreaFactor * overlapArea -> other.Removed <- true | _ -> () ellipses |> List.ofSeq |> List.filter (fun e -> not e.Removed) - |> List.sortWith (fun e1 e2 -> e2.MatchingScore.CompareTo(e1.MatchingScore)) + |> List.sortWith (fun e1 e2 -> e2.MatchingScore.CompareTo e1.MatchingScore) |> List.map (fun e -> e.Ellipse)