From: Greg Burri Date: Tue, 19 Jan 2016 13:08:13 +0000 (+0100) Subject: The minimum area computation wasn't correct. X-Git-Tag: 1.0.11~44 X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=commitdiff_plain;h=cedd2809bf9f802e9c12102d30f63cf29f64442c;hp=97c24aa168f06f507fdff79429038d78a2c33326 The minimum area computation wasn't correct. --- diff --git a/Parasitemia/ParasitemiaCore/Config.fs b/Parasitemia/ParasitemiaCore/Config.fs index 5fdcd0d..93fa2ce 100644 --- a/Parasitemia/ParasitemiaCore/Config.fs +++ b/Parasitemia/ParasitemiaCore/Config.fs @@ -77,7 +77,7 @@ type RBCRadius (radius: float32, parameters: Parameters) = member this.Max = radius + parameters.maxRbcRadius * radius member this.Area = PI * radius ** 2.f - member this.MinArea = parameters.minimumCellAreaFactor * radius + member this.MinArea = parameters.minimumCellAreaFactor * this.Area member this.InfectionArea = parameters.infectionArea * this.Area member this.StainArea = parameters.stainArea * this.Area diff --git a/Parasitemia/ParasitemiaCore/MatchingEllipses.fs b/Parasitemia/ParasitemiaCore/MatchingEllipses.fs index ec10d93..65ae3e9 100644 --- a/Parasitemia/ParasitemiaCore/MatchingEllipses.fs +++ b/Parasitemia/ParasitemiaCore/MatchingEllipses.fs @@ -29,7 +29,7 @@ type MatchingEllipses (radius: float32) = let ellipses = List() // All ellipses with a score below this are removed. - let matchingScoreThreshold = 0.4f // 0.5f + let matchingScoreThreshold = 0.4f member this.Add (e: Ellipse) = ellipses.Add(EllipseScoreFlaggedKd(0.f, e))