projects
/
master-thesis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Little adjustments.
[master-thesis.git]
/
Parasitemia
/
Parasitemia
/
MatchingEllipses.fs
diff --git
a/Parasitemia/Parasitemia/MatchingEllipses.fs
b/Parasitemia/Parasitemia/MatchingEllipses.fs
index
2196122
..
6e6218d
100644
(file)
--- a/
Parasitemia/Parasitemia/MatchingEllipses.fs
+++ b/
Parasitemia/Parasitemia/MatchingEllipses.fs
@@
-12,8
+12,8
@@
open Utils
// Do not take in account matching score below this when two ellipses are matched.
let matchingScoreThreshold1 = 0.6
// Do not take in account matching score below this when two ellipses are matched.
let matchingScoreThreshold1 = 0.6
-// All ellipse
e with a score below this is
removed.
-let matchingScoreThreshold2 =
2
.
+// All ellipse
s with a score below this are
removed.
+let matchingScoreThreshold2 =
600
.
type private EllipseScoreFlaggedKd (matchingScore: float, e: Ellipse) =
let mutable matchingScore = matchingScore
type private EllipseScoreFlaggedKd (matchingScore: float, e: Ellipse) =
let mutable matchingScore = matchingScore
@@
-69,8
+69,8
@@
type MatchingEllipses (radiusMin: float) =
let matchingScore = 2.0 * commonArea / (areaE + areaOther)
if matchingScore >= matchingScoreThreshold1
then
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.
| _ -> ()
// 3) Sort ellipses by their score.