projects
/
master-thesis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Remove the 'DoG' filter.
[master-thesis.git]
/
Parasitemia
/
Parasitemia
/
MatchingEllipses.fs
diff --git
a/Parasitemia/Parasitemia/MatchingEllipses.fs
b/Parasitemia/Parasitemia/MatchingEllipses.fs
index
da74c65
..
99e3cb5
100644
(file)
--- a/
Parasitemia/Parasitemia/MatchingEllipses.fs
+++ b/
Parasitemia/Parasitemia/MatchingEllipses.fs
@@
-9,17
+9,23
@@
open Types
open Utils
open Utils
+// Do not take in account matching score below this when two ellipses are matched.
let matchingScoreThreshold1 = 0.6
let matchingScoreThreshold1 = 0.6
-let matchingScoreThreshold2 = 1.
+
+// All ellipsee with a score below this is removed.
+let matchingScoreThreshold2 = 1. / 100.
type private EllipseScoreFlaggedKd (matchingScore: float, e: Ellipse) =
let mutable matchingScore = matchingScore
type private EllipseScoreFlaggedKd (matchingScore: float, e: Ellipse) =
let mutable matchingScore = matchingScore
+ let perimeter = e.Perimeter
member this.Ellipse = e
member this.MatchingScore = matchingScore
member this.Ellipse = e
member this.MatchingScore = matchingScore
+
+ // The score is proportional to the perimeter because large ellipse will receive more votes.
member this.AddMatchingScore(score: float) =
member this.AddMatchingScore(score: float) =
- matchingScore <- matchingScore + score
+ matchingScore <- matchingScore + score
/ perimeter
member val Processed = false with get, set
member val Removed = false with get, set
member val Processed = false with get, set
member val Removed = false with get, set
@@
-38,6
+44,7
@@
type MatchingEllipses (radiusMin: float) =
member this.Ellipses : Ellipse list =
List.ofSeq ellipses |> List.map (fun e -> e.Ellipse)
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
member this.PrunedEllipses : Ellipse list =
if ellipses.Count = 0
then
@@
-93,7
+100,7
@@
type MatchingEllipses (radiusMin: float) =
for other in tree.Search window do
if not other.Removed && other.MatchingScore < e.MatchingScore
then
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
+ if e.Ellipse.
Scale(0.8).
Contains other.Ellipse.Cx other.Ellipse.Cy
then
other.Removed <- true
ellipses.RemoveAll(fun e -> e.Removed) |> ignore
then
other.Removed <- true
ellipses.RemoveAll(fun e -> e.Removed) |> ignore