X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FParasitesMarker.fs;h=ffe0d14b4289b35e4602c7aac5d87149552ca6ee;hp=22ea041be57de154cc494a7385e650013bdb2121;hb=6c70577f0bcc17881c753f7a527d2ff4672bb6aa;hpb=3990946e49fe34e9adcf0e04b0418cd16676e6fe diff --git a/Parasitemia/ParasitemiaCore/ParasitesMarker.fs b/Parasitemia/ParasitemiaCore/ParasitesMarker.fs index 22ea041..ffe0d14 100644 --- a/Parasitemia/ParasitemiaCore/ParasitesMarker.fs +++ b/Parasitemia/ParasitemiaCore/ParasitesMarker.fs @@ -6,8 +6,6 @@ open System.Linq open Emgu.CV open Emgu.CV.Structure -open Logger - open Utils type Result = { @@ -21,7 +19,7 @@ type Result = { // * 'Infection' corresponds to the parasite. It shouldn't contain thrombocytes. let findMa (green: Image) (filteredGreen: Image) (config: Config.Config) : Result * Image * Image = // We use the filtered image to find the dark stain. - let kmediansResults = Log.LogWithTime("Finding fg/bg (k-medians)", Severity.USER, (fun () -> KMedians.kmedians filteredGreen)) + let kmediansResults = KMedians.kmedians filteredGreen let { KMedians.fg = fg; KMedians.median_bg = median_bg; KMedians.median_fg = median_fg; KMedians.d_fg = d_fg } = kmediansResults let darkStain = d_fg.Cmp(median_bg * float config.Parameters.darkStainLevel, CvEnum.CmpType.GreaterThan) darkStain._And(filteredGreen.Cmp(median_fg, CvEnum.CmpType.LessThan))