X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FMatchingEllipses.fs;h=6e6218d7edb65235faea85ae6867c58bfeca4274;hp=7a4c51b46395fbbde788278750ab4917c01c5c28;hb=ca3f764fc93defb480bb9b1c34e9c41447cc07e0;hpb=21ce317bce2e1b58803bbb1be439161251478568 diff --git a/Parasitemia/Parasitemia/MatchingEllipses.fs b/Parasitemia/Parasitemia/MatchingEllipses.fs index 7a4c51b..6e6218d 100644 --- a/Parasitemia/Parasitemia/MatchingEllipses.fs +++ b/Parasitemia/Parasitemia/MatchingEllipses.fs @@ -13,7 +13,7 @@ open Utils let matchingScoreThreshold1 = 0.6 // All ellipses with a score below this are removed. -let matchingScoreThreshold2 = 2. +let matchingScoreThreshold2 = 600. 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 - other.AddMatchingScore(matchingScore) - e.AddMatchingScore(matchingScore) + other.AddMatchingScore(matchingScore * e.Ellipse.Perimeter) + e.AddMatchingScore(matchingScore * other.Ellipse.Perimeter) | _ -> () // 3) Sort ellipses by their score.