X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FMainAnalysis.fs;h=5ee68865bac7a8f6f92e88081d25f198243aaa31;hb=999a48b8eb25c92e4403c9280fd4fe68f9bc4b7b;hp=ec2aabb9953f8ef789f0ac98b92289128191381b;hpb=044b0ae69df3ac565432545b2fa934589016f9bd;p=master-thesis.git

diff --git a/Parasitemia/Parasitemia/MainAnalysis.fs b/Parasitemia/Parasitemia/MainAnalysis.fs
index ec2aabb..5ee6886 100644
--- a/Parasitemia/Parasitemia/MainAnalysis.fs
+++ b/Parasitemia/Parasitemia/MainAnalysis.fs
@@ -3,6 +3,8 @@
 open System
 open System.Drawing
 
+open FSharp.Collections.ParallelSeq
+
 open Emgu.CV
 open Emgu.CV.Structure
 
@@ -13,17 +15,19 @@ open Types
 
 
 let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) : Cell list =
-    let scaledImg = if config.Parameters.scale = 1.0 then img else img.Resize(config.Parameters.scale, CvEnum.Inter.Area)
-
-    use green = scaledImg.Item(1)
+    use green = img.Item(1)
     let greenFloat = green.Convert<Gray, float32>()
     let filteredGreen = gaussianFilter greenFloat (float config.Parameters.preFilterSigma)
 
     logTime "areaOpen 1" (fun () -> ImgTools.areaOpenF filteredGreen config.Parameters.initialAreaOpen)
 
-    config.RBCRadius <- logTime "Granulometry" (fun() -> Granulometry.findRadius (filteredGreen.Convert<Gray, byte>()) (10, 100) 0.3 |> float32)
+    let r1 = logTime "Granulometry (morpho)" (fun() -> Granulometry.findRadiusByClosing (filteredGreen.Convert<Gray, byte>()) (10, 80) 0.5 |> float32)
+    // let r2 = logTime "Granulometry (area)" (fun() -> Granulometry.findRadiusByAreaClosing filteredGreen (10, 80) |> float32)
+    // log (sprintf "r1: %A, r2: %A" r1 r2)
+    config.RBCRadius <- r1
 
     let secondAreaOpen = int <| config.RBCArea / 3.f
+
     if secondAreaOpen > config.Parameters.initialAreaOpen
     then
         logTime "areaOpen 2" (fun () -> ImgTools.areaOpenF filteredGreen secondAreaOpen)
@@ -58,7 +62,7 @@ let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) : Cell li
         drawEllipses imgAllEllipses allEllipses (Bgr(0.0, 240.0, 240.0)) 0.05
         saveImg imgAllEllipses (buildFileName " - ellipses - all.png")
 
-        let imgEllipses = img.Copy()
+        let imgEllipses = filteredGreenWhitoutStain.Convert<Bgr, byte>()
         drawEllipses imgEllipses ellipses (Bgr(0.0, 240.0, 240.0)) 1.0
         saveImg imgEllipses (buildFileName " - ellipses.png")
 
@@ -81,11 +85,21 @@ let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) : Cell li
 
         saveImg green (buildFileName " - green.png")
 
-        use blue  = scaledImg.Item(0)
+        use blue = img.Item(0)
         saveImg blue (buildFileName " - blue.png")
 
-        use red = scaledImg.Item(2)
+        use red = img.Item(2)
         saveImg red (buildFileName " - red.png")
     | _ -> ()
 
     cells
+
+
+let doMultipleAnalysis (imgs: (string * Image<Bgr, byte>) list) (config : Config) : (string * Cell list) list =
+    let nbConcurrentTaskLimit = 4
+    let n = Environment.ProcessorCount
+
+    imgs
+    |> PSeq.map (fun (id, img) -> id, doAnalysis img id (config.Copy()))
+    |> PSeq.withDegreeOfParallelism (if n > nbConcurrentTaskLimit then nbConcurrentTaskLimit else n)
+    |> PSeq.toList
\ No newline at end of file