X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FKMedians.fs;h=09d6c8f70d525365721fe3390540e07c94c787c4;hp=5ba15db43be2b12c538e2accf6c77be949d9f410;hb=dec96d50e56e1932bbfa09e6bedf90d6b707ccbd;hpb=ba64921fb9a0c36cd8cf802cbf1b2c0f79bc25f6

diff --git a/Parasitemia/Parasitemia/KMedians.fs b/Parasitemia/Parasitemia/KMedians.fs
index 5ba15db..09d6c8f 100644
--- a/Parasitemia/Parasitemia/KMedians.fs
+++ b/Parasitemia/Parasitemia/KMedians.fs
@@ -1,45 +1,52 @@
 module KMedians
 
+open System.Collections.Generic
+open System.Drawing
+
 open Emgu.CV
 open Emgu.CV.Structure
 
-open System.Drawing
+type Result = {
+    fg: Image<Gray, byte>
+    median_bg: float
+    median_fg: float
+    d_fg: Image<Gray, float32> } // Distances to median_fg.
 
-let kmedians (mat: Matrix<float32>) (fgFactor: float) : Matrix<byte> =
+let kmedians (img: Image<Gray, float32>) (fgFactor: float) : Result =
     let nbIteration = 3
-
-    let min = ref 0.0
-    let minLocation = ref <| Point()
-    let max = ref 0.0
-    let maxLocation = ref <| Point()
-    mat.MinMax(min, max, minLocation, maxLocation)
+    let w = img.Width
+    let h = img.Height
+
+    let min = ref [| 0.0 |]
+    let minLocation = ref <| [| Point() |]
+    let max = ref [| 0.0 |]
+    let maxLocation = ref <| [| Point() |]
+    img.MinMax(min, max, minLocation, maxLocation)
     
-    let mutable bgValue = !max - (!max - !min) / 4.0
-    let mutable fgValue = !min + (!max - !min) / 4.0
-    let mutable d_bg = new Matrix<float32>(mat.Size)
-    let mutable d_fg = new Matrix<float32>(mat.Size)
-
-    for i in 1..3 do
-        CvInvoke.Pow(mat - bgValue, 2.0, d_bg)
-        CvInvoke.Pow(mat - fgValue, 2.0, d_fg)
-        let fg = (d_fg * fgFactor).Cmp(d_bg, CvEnum.CmpType.LessThan)
-
-        printfn "test"
-        
-        
-            (*d_bg = (imgFloat - color_bg) .^ 2.0;
-            d_fg = (imgFloat - color_fg) .^ 2.0;
-            fg = d_fg * Background_weight < d_bg;
-            imgFilteredFg = imgFloat;
-            imgFilteredFg(~fg) = nan;
-            color_fg = median(reshape(imgFilteredFg, [], 1), 'omitnan');
-            imgFilteredBg = imgFloat;
-            imgFilteredBg(fg) = nan;
-            color_bg = median(reshape(imgFilteredBg, [], 1), 'omitnan');
-        *)
-
+    let mutable median_bg = (!max).[0] - ((!max).[0] - (!min).[0]) / 4.0
+    let mutable median_fg = (!min).[0] + ((!max).[0] - (!min).[0]) / 4.0
+    let mutable d_bg = new Image<Gray, float32>(img.Size)
+    let mutable d_fg = new Image<Gray, float32>(img.Size)
+    let mutable fg = new Image<Gray, byte>(img.Size)
     
-    new Matrix<byte>(mat.Size)
+    for i in 1..nbIteration do
+        CvInvoke.Pow(img - median_bg, 2.0, d_bg)
+        CvInvoke.Pow(img - median_fg, 2.0, d_fg)
+        fg <- (d_fg * fgFactor).Cmp(d_bg, CvEnum.CmpType.LessThan)
+        
+        median_fg <- MathNet.Numerics.Statistics.Statistics.Median(seq {
+            for i in 0 .. h - 1 do
+                for j in 0 .. w - 1 do
+                    if fg.Data.[i, j, 0] > 0uy then yield img.Data.[i, j, 0] |> float })
+         
+        median_bg <- MathNet.Numerics.Statistics.Statistics.Median(seq {
+            for i in 0 .. h - 1 do
+                for j in 0 .. w - 1 do
+                    if fg.Data.[i, j, 0] = 0uy then yield img.Data.[i, j, 0] |> float })
+                        
+    CvInvoke.Sqrt(d_fg, d_fg)
+
+    { fg = fg; median_bg = median_bg; median_fg = median_fg; d_fg = d_fg }