X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FMatchingEllipses.fs;h=6e6218d7edb65235faea85ae6867c58bfeca4274;hb=ca3f764fc93defb480bb9b1c34e9c41447cc07e0;hp=21961226684b1669e7087a0191cad1f1ee2b9f6c;hpb=84fdf7404133803fdf0dc867a4da68a144975191;p=master-thesis.git

diff --git a/Parasitemia/Parasitemia/MatchingEllipses.fs b/Parasitemia/Parasitemia/MatchingEllipses.fs
index 2196122..6e6218d 100644
--- 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
 
-// All ellipsee with a score below this is removed.
-let matchingScoreThreshold2 = 2.
+// All ellipses with a score below this are removed.
+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.