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

diff --git a/Parasitemia/Parasitemia/KMedians.fs b/Parasitemia/Parasitemia/KMedians.fs
index 09d6c8f..f7f2e54 100644
--- a/Parasitemia/Parasitemia/KMedians.fs
+++ b/Parasitemia/Parasitemia/KMedians.fs
@@ -10,9 +10,9 @@ type Result = {
     fg: Image<Gray, byte>
     median_bg: float
     median_fg: float
-    d_fg: Image<Gray, float32> } // Distances to median_fg.
+    d_fg: Image<Gray, float32> } // Euclidean distances of the foreground to median_fg.
 
-let kmedians (img: Image<Gray, float32>) (fgFactor: float) : Result =
+let kmedians (img: Image<Gray, float32>) : Result =
     let nbIteration = 3
     let w = img.Width
     let h = img.Height
@@ -22,29 +22,30 @@ let kmedians (img: Image<Gray, float32>) (fgFactor: float) : Result =
     let max = ref [| 0.0 |]
     let maxLocation = ref <| [| Point() |]
     img.MinMax(min, max, minLocation, maxLocation)
-    
+
     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)
+    use 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)
-    
-    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)
+
+    for i in 1 .. nbIteration do
+        d_bg <- img.AbsDiff(Gray(median_bg))
+        d_fg <- img.AbsDiff(Gray(median_fg))
+
+        CvInvoke.Compare(d_fg, d_bg, fg, CvEnum.CmpType.LessThan)
+
+        let bg_values = List<float>()
+        let fg_values = List<float>()
+
+        for i in 0 .. h - 1 do
+            for j in 0 .. w - 1 do
+                if fg.Data.[i, j, 0] > 0uy
+                then fg_values.Add(float img.Data.[i, j, 0])
+                else bg_values.Add(float img.Data.[i, j, 0])
+
+        median_bg <- MathNet.Numerics.Statistics.Statistics.Median(bg_values)
+        median_fg <- MathNet.Numerics.Statistics.Statistics.Median(fg_values)
 
     { fg = fg; median_bg = median_bg; median_fg = median_fg; d_fg = d_fg }