X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FMainAnalysis.fs;h=2be9be151c4cf70b1f9240ad9de12222694df2f4;hp=c987e63c0146736e1fbd598152713686d96a0c98;hb=807437584bdd3d7b7b33be8282472f81f8cce606;hpb=f9ee9f2c0c1194a6a8f7475ee2ca0b7076b32261 diff --git a/Parasitemia/Parasitemia/MainAnalysis.fs b/Parasitemia/Parasitemia/MainAnalysis.fs index c987e63..2be9be1 100644 --- a/Parasitemia/Parasitemia/MainAnalysis.fs +++ b/Parasitemia/Parasitemia/MainAnalysis.fs @@ -3,6 +3,8 @@ open System open System.Drawing +open FSharp.Collections.ParallelSeq + open Emgu.CV open Emgu.CV.Structure @@ -12,84 +14,44 @@ open Config open Types -let doAnalysis (img: Image) (name: string) (config: Config) : Cell list = - - use scaledImg = if config.Parameters.scale = 1.0 then img else img.Resize(config.Parameters.scale, CvEnum.Inter.Area) - - use green = scaledImg.Item(1) +let doAnalysis (img: Image) (name: string) (config: Config) (reportProgress: (int -> unit) option) : Cell list = + let inline report (percent: int) = + match reportProgress with + | Some f -> f percent + | _ -> () + use green = img.Item(1) let greenFloat = green.Convert() + let filteredGreen = gaussianFilter greenFloat (float config.Parameters.preFilterSigma) - let filteredGreen = gaussianFilter green config.Parameters.preFilterSigma + logTime "areaOpen 1" (fun () -> ImgTools.areaOpenF filteredGreen config.Parameters.initialAreaOpen) + report 8 - (*let maximaImg = filteredGreen.Copy() - let maxima = logTime "maxima" (fun () -> ImgTools.findMaxima maximaImg) - for m in maxima do - ImgTools.drawPoints maximaImg m 255uy + let r1 = logTime "Granulometry (morpho)" (fun() -> Granulometry.findRadiusByClosing (filteredGreen.Convert()) (10, 80) 0.5 |> float32) + // let r2 = logTime "Granulometry (area)" (fun() -> Granulometry.findRadiusByAreaClosing filteredGreen (10, 80) |> float32) + // log (sprintf "r1: %A, r2: %A" r1 r2) + config.RBCRadius <- r1 + report 24 - let greenOpen1 = filteredGreen.Copy() - logTime "areaOpen1" (fun () -> ImgTools.areaOpen greenOpen1 2000)*) + let secondAreaOpen = int <| config.RBCArea * config.Parameters.ratioSecondAreaOpen - let initialAreaOpen = 2000 - logTime "areaOpen 1" (fun () -> ImgTools.areaOpen filteredGreen 2000) - - config.RBCRadius <- Granulometry.findRadius filteredGreen (10, 100) 0.5 |> float - - let secondAreaOpen = int <| config.RBCArea / 3. - if secondAreaOpen > initialAreaOpen + if secondAreaOpen > config.Parameters.initialAreaOpen then - logTime "areaOpen 2" (fun () -> ImgTools.areaOpen filteredGreen secondAreaOpen) - - let filteredGreenFloat = filteredGreen.Convert() // Is it neccessary? + logTime "areaOpen 2" (fun () -> ImgTools.areaOpenF filteredGreen secondAreaOpen) - let parasites, filteredGreenWhitoutInfection, filteredGreenWhitoutStain = ParasitesMarker.find filteredGreen filteredGreenFloat config + let parasites, filteredGreenWhitoutStain = ParasitesMarker.find filteredGreen config //let parasites, filteredGreenWhitoutInfection, filteredGreenWhitoutStain = ParasitesMarker.findMa greenFloat filteredGreenFloat config - let filteredGreenWhitoutInfectionFloat = filteredGreenWhitoutInfection.Convert() - let filteredGreenWhitoutStainFloat = filteredGreenWhitoutStain.Convert() - - use sobelKernel = - new ConvolutionKernelF(array2D [[ 1.0f; 0.0f; -1.0f ] - [ 2.0f; 0.0f; -2.0f ] - [ 1.0f; 0.0f; -1.0f ]], Point(0, 0)) - - use xEdges = filteredGreenWhitoutStainFloat.Convolution(sobelKernel).Convert() - use yEdges = filteredGreenWhitoutStainFloat.Convolution(sobelKernel.Transpose()).Convert() - - let xEdgesData = xEdges.Data - let yEdgesData = yEdges.Data - for r in 0..xEdges.Rows-1 do - xEdgesData.[r, 0, 0] <- 0.0 - xEdgesData.[r, xEdges.Cols-1, 0] <- 0.0 - yEdgesData.[r, 0, 0] <- 0.0 - yEdgesData.[r, xEdges.Cols-1, 0] <- 0.0 - - for c in 0..xEdges.Cols-1 do - xEdgesData.[0, c, 0] <- 0.0 - xEdgesData.[xEdges.Rows-1, c, 0] <- 0.0 - yEdgesData.[0, c, 0] <- 0.0 - yEdgesData.[xEdges.Rows-1, c, 0] <- 0.0 - - use magnitudes = new Matrix(xEdges.Size) - CvInvoke.CartToPolar(xEdges, yEdges, magnitudes, new Mat()) // Compute the magnitudes (without angles). - - let min = ref 0.0 - let minLocation = ref <| Point() - let max = ref 0.0 - let maxLocation = ref <| Point() - magnitudes.MinMax(min, max, minLocation, maxLocation) - - use magnitudesByte = ((magnitudes / !max) * 255.0).Convert() // Otsu from OpenCV only support 'byte'. - use edges = new Matrix(xEdges.Size) - CvInvoke.Threshold(magnitudesByte, edges, 0.0, 1.0, CvEnum.ThresholdType.Otsu ||| CvEnum.ThresholdType.Binary) |> ignore - - logTime "Finding edges" (fun() -> thin edges) - logTime "Removing small connected components from thinning" (fun () -> removeArea edges 12) + + let edges, xGradient, yGradient = logTime "Finding edges" (fun () -> ImgTools.findEdges filteredGreenWhitoutStain) + logTime "Removing small connected components from thinning" (fun () -> removeArea edges (config.RBCRadius ** 2.f / 50.f |> int)) let allEllipses, ellipses = logTime "Finding ellipses" (fun () -> - let matchingEllipses = Ellipse.find edges xEdges yEdges config - matchingEllipses.Ellipses, matchingEllipses.PrunedEllipses ) + let matchingEllipses = Ellipse.find edges xGradient yGradient config + matchingEllipses.Ellipses, matchingEllipses.PrunedEllipses) + report 80 let cells = logTime "Classifier" (fun () -> Classifier.findCells ellipses parasites filteredGreenWhitoutStain config) + report 100 // Output pictures if debug flag is set. match config.Debug with @@ -106,15 +68,13 @@ let doAnalysis (img: Image) (name: string) (config: Config) : Cell li saveImg parasites.infection (buildFileName " - parasites - infection.png") let imgAllEllipses = img.Copy() - drawEllipses imgAllEllipses allEllipses (Bgr(0.0, 240.0, 240.0)) 0.1 + drawEllipses imgAllEllipses allEllipses (Bgr(0.0, 240.0, 240.0)) 0.05 saveImg imgAllEllipses (buildFileName " - ellipses - all.png") - let imgEllipses = img.Copy() + let imgEllipses = filteredGreenWhitoutStain.Convert() drawEllipses imgEllipses ellipses (Bgr(0.0, 240.0, 240.0)) 1.0 saveImg imgEllipses (buildFileName " - ellipses.png") - // saveImg (kmediansResults.fg * 255.0) (buildFileName " - foreground.png") - let imgCells = img.Copy() drawCells imgCells false cells saveImg imgCells (buildFileName " - cells.png") @@ -123,25 +83,49 @@ let doAnalysis (img: Image) (name: string) (config: Config) : Cell li drawCells imgCells' true cells saveImg imgCells' (buildFileName " - cells - full.png") - let filteredGreenMaxima = gaussianFilter green config.Parameters.preFilterSigma + let filteredGreenMaxima = gaussianFilter greenFloat config.Parameters.preFilterSigma for m in ImgTools.findMaxima filteredGreenMaxima do - ImgTools.drawPoints filteredGreenMaxima m 255uy + ImgTools.drawPoints filteredGreenMaxima m 255.f saveImg filteredGreenMaxima (buildFileName " - filtered - maxima.png") saveImg filteredGreen (buildFileName " - filtered.png") saveImg filteredGreenWhitoutStain (buildFileName " - filtered closed stain.png") - saveImg filteredGreenWhitoutInfection (buildFileName " - filtered closed infection.png") - - (*saveImg parasitesMarker (buildFileName " - parasites (area closing).png") - saveImg stainMarker (buildFileName " - stain (area closing).png")*) + //saveImg filteredGreenWhitoutInfection (buildFileName " - filtered closed infection.png") saveImg green (buildFileName " - green.png") - use blue = scaledImg.Item(0) + use blue = img.Item(0) saveImg blue (buildFileName " - blue.png") - use red = scaledImg.Item(2) + use red = img.Item(2) saveImg red (buildFileName " - red.png") | _ -> () cells + + +// ID * cell radius * cell list. +let doMultipleAnalysis (imgs: (string * Image) list) (config : Config) (reportProgress: (int -> unit) option) : (string * float * Cell list) list = + let inline report (percent: int) = + match reportProgress with + | Some f -> f percent + | _ -> () + + let monitor = Object() + let mutable total = 0 + let nbImgs = List.length imgs + let reportProgressImg = + (fun progress -> + lock monitor (fun () -> total <- total + progress) + report (total / nbImgs)) + + let nbConcurrentTaskLimit = 4 + let n = Environment.ProcessorCount + + imgs + |> PSeq.map (fun (id, img) -> + let localConfig = config.Copy() + let cells = doAnalysis img id localConfig (Some reportProgressImg) + id, float localConfig.RBCRadius, cells) + |> PSeq.withDegreeOfParallelism (if n > nbConcurrentTaskLimit then nbConcurrentTaskLimit else n) + |> PSeq.toList