X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FClassifier.fs;h=c54a3b1d27a3dd73548090dbbc51470f573fc0bb;hb=21ce317bce2e1b58803bbb1be439161251478568;hp=3ed42f0e2ff5800bf940526d3f7bc7b4d8bbd523;hpb=b070295cf67b2025164a34b6594e84f0d771cdc9;p=master-thesis.git diff --git a/Parasitemia/Parasitemia/Classifier.fs b/Parasitemia/Parasitemia/Classifier.fs index 3ed42f0..c54a3b1 100644 --- a/Parasitemia/Parasitemia/Classifier.fs +++ b/Parasitemia/Parasitemia/Classifier.fs @@ -21,7 +21,7 @@ type private EllipseFlaggedKd (e: Ellipse) = member this.Y = this.Cy -let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (fg: Image) (config: Config.Config) : Cell list = +let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker2.Result) (img: Image) (config: Config.Config) : Cell list = if ellipses.IsEmpty then [] @@ -29,10 +29,10 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (fg: let infection = parasites.infection.Copy() // To avoid to modify the parameter. // This is the minimum window size to check if other ellipses touch 'e'. - let searchRegion (e: Ellipse) = { KdTree.minX = e.Cx - (e.A + config.maxRBCSize) * config.scale - KdTree.maxX = e.Cx + (e.A + config.maxRBCSize) * config.scale - KdTree.minY = e.Cy - (e.A + config.maxRBCSize) * config.scale - KdTree.maxY = e.Cy + (e.A + config.maxRBCSize) * config.scale } + let searchRegion (e: Ellipse) = { KdTree.minX = e.Cx - (e.A + config.RBCMaxRadius) * config.Parameters.scale + KdTree.maxX = e.Cx + (e.A + config.RBCMaxRadius) * config.Parameters.scale + KdTree.minY = e.Cy - (e.A + config.RBCMaxRadius) * config.Parameters.scale + KdTree.maxY = e.Cy + (e.A + config.RBCMaxRadius) * config.Parameters.scale } // The minimum window to contain a given ellipse. let ellipseWindow (e: Ellipse) = @@ -40,8 +40,26 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (fg: let a = int (e.A + 0.5) cx - a, cy - a, cx + a, cy + a - let w = float fg.Width - let h = float fg.Height + let w = img.Width + let w_f = float w + let h = img.Height + let h_f = float h + + // Return 'true' if the point 'p' is owned by e. + // The lines represents all intersections with other ellipses. + let pixelOwnedByE (p: PointD) (e: Ellipse) (lines: Line list) = + e.Contains p.X p.Y && + seq { + let c = PointD(e.Cx, e.Cy) + for d1 in lines do + let d2 = Utils.lineFromTwoPoints c p + if d2.Valid + then + let p' = Utils.pointFromTwoLines d1 d2 + yield sign (c.X - p.X) <> sign (c.X - p'.X) || Utils.squaredDistanceTwoPoints c p' > Utils.squaredDistanceTwoPoints c p // 'false' -> the point is owned by another ellipse. + else + yield true + } |> Seq.forall id let ellipses = ellipses |> List.map EllipseFlaggedKd @@ -57,66 +75,53 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (fg: | _ -> None ) - let ellipsesWithNeigbors = ellipses |> List.choose (fun e -> if e.Removed then None else Some (e, neighbors e)) + let ellipsesWithNeigbors = ellipses |> List.map (fun e -> e, neighbors e) + + // 2) Remove ellipses with a high standard deviation (high contrast). + let globalStdDiviation = MathNet.Numerics.Statistics.StreamingStatistics.StandardDeviation(seq { + for y in 0 .. h - 1 do + for x in 0 .. w - 1 do + yield img.Data.[y, x, 0] |> float }) - // 2) Remove ellipses with a lower percentage of foreground. (taken from the lower score to the highest). for e, neighbors in List.rev ellipsesWithNeigbors do let minX, minY, maxX, maxY = ellipseWindow e - let mutable totalElement = 0 - let mutable fgElement = 0 - for y in (if minY < 0 then 0 else minY) .. (if maxY >= fg.Height then fg.Height - 1 else maxY) do - for x in (if minX < 0 then 0 else minX) .. (if maxX >= fg.Width then fg.Width - 1 else maxX) do - let yf, xf = float y, float x - if e.Contains xf yf && neighbors |> List.forall (fun (otherE, _, _) -> otherE.Removed || not <| otherE.Contains xf yf) + let stdDiviation = MathNet.Numerics.Statistics.StreamingStatistics.StandardDeviation(seq { + for y in (if minY < 0 then 0 else minY) .. (if maxY >= h then h - 1 else maxY) do + for x in (if minX < 0 then 0 else minX) .. (if maxX >= w then w - 1 else maxX) do + let p = PointD(float x, float y) + if pixelOwnedByE p e (neighbors |> List.choose (fun (otherE, p1, p2) -> if otherE.Removed then None else Some (Utils.lineFromTwoPoints p1 p2))) then - totalElement <- totalElement + 1 - if fg.Data.[y, x, 0] > 0uy - then - fgElement <- fgElement + 1 + yield img.Data.[y, x, 0] |> float }) - if (float fgElement) / (float totalElement) < config.percentageOfFgValidCell + if stdDiviation > globalStdDiviation * config.Parameters.standardDeviationMaxRatio then e.Removed <- true // 3) Remove ellipses touching the edges. for e in ellipses do - if e.isOutside w h then e.Removed <- true + if e.isOutside w_f h_f then e.Removed <- true // 4) Remove ellipses with little area. + let minArea = config.RBCMinArea for e, neighbors in ellipsesWithNeigbors do if not e.Removed then let minX, minY, maxX, maxY = ellipseWindow e let mutable area = 0 - for y in (if minY < 0 then 0 else minY) .. (if maxY >= fg.Height then fg.Height - 1 else maxY) do - for x in (if minX < 0 then 0 else minX) .. (if maxX >= fg.Width then fg.Width - 1 else maxX) do - let yf, xf = float y, float x - if fg.Data.[y, x, 0] > 0uy && - e.Contains xf yf && - neighbors |> List.forall (fun (otherE, _, _) -> otherE.Removed || not <| otherE.Contains xf yf) - then - area <- area + 1 + for y in (if minY < 0 then 0 else minY) .. (if maxY >= h then h - 1 else maxY) do + for x in (if minX < 0 then 0 else minX) .. (if maxX >= w then w - 1 else maxX) do + let p = PointD(float x, float y) + if pixelOwnedByE p e (neighbors |> List.choose (fun (otherE, p1, p2) -> if otherE.Removed then None else Some (Utils.lineFromTwoPoints p1 p2))) + then + area <- area + 1 - if area < config.minimumCellArea + if area < int minArea then e.Removed <- true // 5) Define pixels associated to each ellipse and create the cells. - - // Return 'true' if the point 'p' is owned by e. - // The lines represents all intersections with other ellipses. - let pixelOwnedByE (p: PointD) (e: Ellipse) (lines: Line list) = - e.Contains p.X p.Y && - seq { - let c = PointD(e.Cx, e.Cy) - for d1 in lines do - let d2 = Utils.lineFromTwoPoints c p - let p' = Utils.pointFromTwoLines d1 d2 - yield sign (c.X - p.X) <> sign (c.X - p'.X) || Utils.squaredDistanceTwoPoints c p' > Utils.squaredDistanceTwoPoints c p // 'false' -> the point is owned by another ellipse. - } |> Seq.forall id - ellipsesWithNeigbors |> List.choose (fun (e, neighbors) -> if e.Removed @@ -130,25 +135,14 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (fg: let mutable darkStainPixels = 0 let mutable nbElement = 0 - let mutable stain_x = 0.0 - let mutable stain_x2 = 0.0 - let mutable stain_y = 0.0 - let mutable stain_y2 = 0.0 - - let mutable sumCoords_y = 0 - let mutable sumCoords_x = 0 - let elements = new Matrix(maxY - minY + 1, maxX - minX + 1) for y in minY .. maxY do for x in minX .. maxX do let p = PointD(float x, float y) - if pixelOwnedByE p e (neighbors |> List.choose (fun (otherE, p1, p2) -> if otherE.Removed then None else Some (Utils.lineFromTwoPoints p1 p2))) && - fg.Data.[y, x, 0] > 0uy + if pixelOwnedByE p e (neighbors |> List.choose (fun (otherE, p1, p2) -> if otherE.Removed then None else Some (Utils.lineFromTwoPoints p1 p2))) then elements.[y-minY, x-minX] <- 1uy nbElement <- nbElement + 1 - sumCoords_y <- sumCoords_y + y - sumCoords_x <- sumCoords_x + x if infection.Data.[y, x, 0] > 0uy then @@ -157,21 +151,17 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (fg: if parasites.stain.Data.[y, x, 0] > 0uy then stainPixels <- stainPixels + 1 - stain_x <- stain_x + (float x) - stain_x2 <- stain_x2 + (float x) ** 2.0 - stain_y <- stain_y + (float y) - stain_y2 <- stain_y2 + (float y) ** 2.0 if parasites.darkStain.Data.[y, x, 0] > 0uy then darkStainPixels <- darkStainPixels + 1 let cellClass = - if float darkStainPixels > config.MaxDarkStainRatio * (float nbElement) (* || + if float darkStainPixels > config.Parameters.maxDarkStainRatio * (float nbElement) (* || sqrt (((float sumCoords_x) / (float nbElement) - e.Cx) ** 2.0 + ((float sumCoords_y) / (float nbElement) - e.Cy) ** 2.0) > e.A * config.maxOffcenter *) then Peculiar - elif infectedPixels.Count > config.infectionPixelsRequired + elif infectedPixels.Count > config.Parameters.parasitePixelsRequired then let infectionToRemove = ImgTools.connectedComponents parasites.stain infectedPixels for p in infectionToRemove do