X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FAnalysis.fs;h=f607760422c3cca9f3ddea966b5ec0d15c3491f3;hp=bad0daf64b2d4f666c5a808009e6f2d705947e3e;hb=e8d14548fc5b127970fccb19bad146512f7ac6d9;hpb=23466ba92c5595f6c0b9f97c86a221a4e5ffebe9 diff --git a/Parasitemia/ParasitemiaCore/Analysis.fs b/Parasitemia/ParasitemiaCore/Analysis.fs index bad0daf..f607760 100644 --- a/Parasitemia/ParasitemiaCore/Analysis.fs +++ b/Parasitemia/ParasitemiaCore/Analysis.fs @@ -27,25 +27,23 @@ open Types /// The first call returning 'false' will cancel the analysis. /// The 'int' parameter correspond to the progression from 0 to 100 /// A list of detected cells or nothing if the process has been cancelled -let doAnalysis (img: Image) (name: string) (config: Config) (reportProgress: (int -> bool) option) : Cell list option = +let doAnalysis (img : Image) (name : string) (config : Config) (reportProgress : (int -> bool) option) : Cell list option = // To report the progress of this function from 0 to 100. // Return 'None' if the process must be aborted. - let reportWithVal (percent: int) (value: 'a) : 'a option = + let reportWithVal (percent : int) (value : 'a) : 'a option = match reportProgress with - | Some f -> - if f percent - then Some value - else None + | Some f -> if f percent then Some value else None | _ -> Some value - let report (percent: int) : unit option = + let report (percent : int) : unit option = reportWithVal percent () - let inline buildLogWithName (text: string) = sprintf "(%s) %s" name text - let logWithName mess = Log.User(buildLogWithName mess) - let inline logTimeWithName (text: string) (f: unit -> 'a option) : 'a option = Log.LogWithTime((buildLogWithName text), Severity.USER, f) + let inline buildLogWithName (text : string) = sprintf "№ %s: %s" name text + let logWithName mess = Log.Info "%s" (buildLogWithName mess) + let inline logTimeWithName (text : string) (f : unit -> 'a option) : 'a option = Log.LogWithTime Severity.INFO f "%s" (buildLogWithName text) + // Monadic construction to be able to abort the progress when running. maybe { do! report 0 @@ -53,13 +51,13 @@ let doAnalysis (img: Image) (name: string) (config: Config) (reportPr use img_float = img.Convert() - use img_RBC = img_float.[1] // mergeChannelsWithProjection img_float config.Parameters.averageColor_RBC config.Parameters.averageColor_BG 255. + use img_RBC = img_float.[1] // Green. use img_RBC_filtered = gaussianFilter img_RBC config.LPFStandardDeviationRBC - use img_parasites = img_float.[2] // mergeChannelsWithProjection img_float config.Parameters.averageColor_Parasite config.Parameters.averageColor_RBC 255. + use img_parasites = img_float.[2] // Red. use img_parasites_filtered = gaussianFilter img_parasites config.LPFStandardDeviationParasite - logWithName (sprintf "Nominal erythrocyte diameter: %A" config.RBCRadiusByResolution) + logWithName (sprintf "Nominal erythrocyte diameter: %O" config.RBCRadiusByResolution) let initialAreaOpening = int <| config.RBCRadiusByResolution.Area * config.Parameters.ratioAreaPaleCenter * 1.1f // We do an area opening a little larger to avoid to do a second one in the case the radius found is near the initial one. do! logTimeWithName "First area opening" (fun () -> areaOpenF img_RBC_filtered initialAreaOpening; report 10) @@ -67,17 +65,18 @@ let doAnalysis (img: Image) (name: string) (config: Config) (reportPr let range = let delta = config.Parameters.granulometryRange * config.RBCRadiusByResolution.Pixel int <| config.RBCRadiusByResolution.Pixel - delta, int <| config.RBCRadiusByResolution.Pixel + delta + let! radius = logTimeWithName "Granulometry (area)" (fun() -> reportWithVal 10 (Granulometry.findRadiusByAreaClosing img_RBC_filtered range |> float32)) + //let! radius = logTimeWithName "Granulometry (morpho)" (fun() -> reportWithVal 10 (Granulometry.findRadiusByClosing img_RBC_filtered range 1. true |> float32)) config.SetRBCRadius <| radius - logWithName (sprintf "Found erythrocyte diameter: %A" config.RBCRadius) + logWithName (sprintf "Found erythrocyte diameter: %O" config.RBCRadius) do! report 20 do! let secondAreaOpening = int <| config.RBCRadius.Area * config.Parameters.ratioAreaPaleCenter - if secondAreaOpening > initialAreaOpening - then + if secondAreaOpening > initialAreaOpening then logTimeWithName "Second area opening" (fun () -> areaOpenF img_RBC_filtered secondAreaOpening; report 30) else report 30 @@ -100,7 +99,7 @@ let doAnalysis (img: Image) (name: string) (config: Config) (reportPr let! prunedEllipses = logTimeWithName "Ellipses pruning" (fun () -> reportWithVal 80 (matchingEllipses.PrunedEllipses)) - let! cells = logTimeWithName "Classifier" (fun () -> reportWithVal 100 (Classifier.findCells prunedEllipses parasites img_RBC_filtered config)) + let! cells = logTimeWithName "Classifier" (fun () -> reportWithVal 100 (Classifier.findCells prunedEllipses parasites img.Width img.Height config)) logWithName "Analysis finished" @@ -119,8 +118,8 @@ let doAnalysis (img: Image) (name: string) (config: Config) (reportPr IO.saveImg parasites.parasite (buildFileName " - parasites - stain.png") IO.saveImg parasites.nucleus (buildFileName " - parasites - infection.png") - let imgAllEllipses = img.Copy() - Drawing.drawEllipses imgAllEllipses matchingEllipses.Ellipses (Bgr(255.0, 255.0, 255.0)) 0.04 + let imgAllEllipses = img_RBC_filtered.Copy() + Drawing.drawEllipses imgAllEllipses matchingEllipses.Ellipses (Gray(200.0)) 0.04 IO.saveImg imgAllEllipses (buildFileName " - ellipses - all.png") let imgEllipses = img_RBC_filtered.Convert() @@ -135,10 +134,10 @@ let doAnalysis (img: Image) (name: string) (config: Config) (reportPr Drawing.drawCells imgCells' true cells IO.saveImg imgCells' (buildFileName " - cells - full.png") - let filteredGreenMaxima = gaussianFilter img_RBC config.LPFStandardDeviationRBC - for m in findMaxima filteredGreenMaxima do - Drawing.drawPoints filteredGreenMaxima m 255.f - IO.saveImg filteredGreenMaxima (buildFileName " - filtered - maxima.png") + (* let filteredRBCMaxima = gaussianFilter img_RBC config.LPFStandardDeviationRBC + for m in findMaxima filteredRBCMaxima do + Drawing.drawPoints filteredRBCMaxima m 255.f + IO.saveImg filteredRBCMaxima (buildFileName " - filtered - maxima.png") *) IO.saveImg imgWhitoutParasite (buildFileName " - filtered closed stain.png") IO.saveImg imgWithoutNucleus (buildFileName " - filtered closed infection.png") @@ -146,12 +145,13 @@ let doAnalysis (img: Image) (name: string) (config: Config) (reportPr IO.saveImg img_RBC_filtered (buildFileName " - source - RBC.png") IO.saveImg img_parasites_filtered (buildFileName " - source - parasites.png") - IO.saveImg (normalize img_float.[2] 255.) (buildFileName " - source - red.png") - IO.saveImg (normalize img_float.[1] 255.) (buildFileName " - source - green.png") - IO.saveImg (normalize img_float.[0] 255.) (buildFileName " - source - blue.png") + IO.saveImg img_float.[2] (buildFileName " - source - red.png") + IO.saveImg img_float.[1] (buildFileName " - source - green.png") + IO.saveImg img_float.[0] (buildFileName " - source - blue.png") | _ -> () - return cells } + return cells + } /// /// Do multiple analyses on the same time. The number of concurrent process depends if the number of the core. @@ -161,8 +161,8 @@ let doAnalysis (img: Image) (name: string) (config: Config) (reportPr /// The first call returning 'false' will cancel the analysis. /// The 'int' parameter correspond to the progression from 0 to 100 /// 'None' if the process has been cancelled or the list of result as (name * cells), 'name' corresponds to the given name -let doMultipleAnalysis (imgs: (string * Config * Image) list) (reportProgress: (int -> bool) option) : (string * Cell list) list option = - let report (percent: int) : bool = +let doMultipleAnalysis (imgs : (string * Config * Image) list) (reportProgress : (int -> bool) option) : (string * Cell list) list option = + let report (percent : int) : bool = match reportProgress with | Some f -> f percent | _ -> true @@ -170,7 +170,7 @@ let doMultipleAnalysis (imgs: (string * Config * Image) list) (report let progressPerAnalysis = System.Collections.Concurrent.ConcurrentDictionary() let nbImgs = List.length imgs - let reportProgressImg (id: string) (progress: int) = + let reportProgressImg (id : string) (progress : int) = progressPerAnalysis.AddOrUpdate(id, progress, (fun _ _ -> progress)) |> ignore report (progressPerAnalysis.Values.Sum() / nbImgs) @@ -180,14 +180,21 @@ let doMultipleAnalysis (imgs: (string * Config * Image) list) (report imgs |> PSeq.choose ( fun (id, config, img) -> - match doAnalysis img id config (Some (fun p -> reportProgressImg id p)) with - | Some result -> Some (id, result) - | None -> None) + try + match doAnalysis img id config (Some (fun p -> reportProgressImg id p)) with + | Some result -> Some (id, result) + | None -> None + with + | ex -> + Log.Error "Analysis %s failed: %O" id ex + None + ) |> PSeq.withDegreeOfParallelism n |> PSeq.toList // If one of the analyses has been aborted we return 'None'. - if List.length results <> List.length imgs - then None - else Some results + if List.length results <> List.length imgs then + None + else + Some results