X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FParasitesMarker.fs;h=f1a94e100b28153288ae67eea8387811e46083c2;hp=71c15a990801c4653bd2aacf13070077089d0596;hb=044b0ae69df3ac565432545b2fa934589016f9bd;hpb=53440e757b4a4ab2a81b0f6a5dd1a2002c0133ba

diff --git a/Parasitemia/Parasitemia/ParasitesMarker.fs b/Parasitemia/Parasitemia/ParasitesMarker.fs
index 71c15a9..f1a94e1 100644
--- a/Parasitemia/Parasitemia/ParasitesMarker.fs
+++ b/Parasitemia/Parasitemia/ParasitesMarker.fs
@@ -20,9 +20,9 @@ type Result = {
 let findMa (green: Image<Gray, float32>) (filteredGreen: Image<Gray, float32>) (config: Config.Config) : Result * Image<Gray, byte> * Image<Gray, byte> =
 
     // We use the filtered image to find the dark stain.
-    let kmediansResults = logTime "Finding fg/bg (k-medians)" (fun () -> KMedians.kmedians filteredGreen 1.0)
+    let kmediansResults = logTime "Finding fg/bg (k-medians)" (fun () -> 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 * config.Parameters.darkStainLevel, CvEnum.CmpType.GreaterThan)
+    let darkStain = d_fg.Cmp(median_bg * float config.Parameters.darkStainLevel, CvEnum.CmpType.GreaterThan)
     darkStain._And(filteredGreen.Cmp(median_fg, CvEnum.CmpType.LessThan))
     darkStain._And(fg)
 
@@ -50,9 +50,9 @@ let findMa (green: Image<Gray, float32>) (filteredGreen: Image<Gray, float32>) (
 // * 'Dark stain' corresponds to the colored pixel, it's independent of the size of the areas.
 // * 'Stain' corresponds to the stain around the parasites.
 // * 'Infection' corresponds to the parasite. It shouldn't contain thrombocytes.
-let find (filteredGreen: Image<Gray, float32>) (config: Config.Config) : Result * Image<Gray, float32> * Image<Gray, float32> =
+let find (filteredGreen: Image<Gray, float32>) (config: Config.Config) : Result * Image<Gray, float32> =
 
-    let filteredGreenWithoutInfection = filteredGreen.Copy()
+    use filteredGreenWithoutInfection = filteredGreen.Copy()
     ImgTools.areaCloseF filteredGreenWithoutInfection (int config.InfectionArea)
 
     let filteredGreenWithoutStain = filteredGreenWithoutInfection.Copy()
@@ -61,18 +61,20 @@ let find (filteredGreen: Image<Gray, float32>) (config: Config.Config) : Result
     // We use the filtered image to find the dark stain.
 
     // With K-Means.
-    let kmeansResults = logTime "Finding fg/bg (k-means)" (fun () -> KMeans.kmeans (filteredGreenWithoutInfection) 1.0)
+    let kmeansResults = logTime "Finding fg/bg (k-means)" (fun () -> KMeans.kmeans (filteredGreenWithoutInfection))
     let { KMeans.mean_bg = value_bg; KMeans.mean_fg = value_fg; KMeans.d_fg = d_fg } = kmeansResults
 
     // With K-Medians.
-    (* let kmediansResults = logTime "Finding fg/bg (k-medians)" (fun () -> KMedians.kmedians (filteredGreenWithoutInfection) 1.0) // FIXME: avoid converting this again in MainAnalysis
+    (* let kmediansResults = logTime "Finding fg/bg (k-medians)" (fun () -> KMedians.kmedians (filteredGreenWithoutInfection)) // FIXME: avoid converting this again in MainAnalysis
     let { KMedians.median_bg = value_bg; KMedians.median_fg = value_fg; KMedians.d_fg = d_fg } = kmediansResults *)
 
-    let darkStain = d_fg.Cmp(value_bg * config.Parameters.darkStainLevel, CvEnum.CmpType.GreaterThan)
-    darkStain._And(filteredGreenWithoutInfection.Cmp(value_fg, CvEnum.CmpType.LessThan))
+    let darkStain = d_fg.Cmp((float value_bg) * config.Parameters.darkStainLevel, CvEnum.CmpType.GreaterThan)
+    darkStain._And(filteredGreenWithoutInfection.Cmp(float value_fg, CvEnum.CmpType.LessThan))
 
     let marker (img: Image<Gray, float32>) (closed: Image<Gray, float32>) (level: float) : Image<Gray, byte> =
-        let diff = closed - (img * level)
+        let diff = img.Copy() // closed - (img * level)
+        diff._Mul(level)
+        CvInvoke.Subtract(closed, diff, diff)
         diff._ThresholdBinary(Gray(0.0), Gray(255.))
         diff.Convert<Gray, byte>()
 
@@ -82,7 +84,6 @@ let find (filteredGreen: Image<Gray, float32>) (config: Config.Config) : Result
     { darkStain = darkStain
       infection = infectionMarker
       stain = stainMarker },
-    filteredGreenWithoutInfection,
     filteredGreenWithoutStain