X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FProgram.fs;h=09f43126106c852a7f65209546448e8db679f893;hp=86de4354d7e75dd83208e12737a6d68e2eeb4e1f;hb=044b0ae69df3ac565432545b2fa934589016f9bd;hpb=5ac2dedf8ead5275ac216e0b41829ab39c843800

diff --git a/Parasitemia/Parasitemia/Program.fs b/Parasitemia/Parasitemia/Program.fs
index 86de435..09f4312 100644
--- a/Parasitemia/Parasitemia/Program.fs
+++ b/Parasitemia/Parasitemia/Program.fs
@@ -9,6 +9,9 @@ open System.Windows.Shapes
 open System.Windows.Controls
 open System.Drawing
 open System.Diagnostics
+open System.Threading
+
+open FSharp.Collections.ParallelSeq
 
 open Emgu.CV
 open Emgu.CV.Structure
@@ -57,41 +60,37 @@ let parseArgs (args: string[]) : Arguments =
 let main args =
     match parseArgs args with
     | mode, debug ->
-        let scale = 1.
-        let config = {
-            debug = if debug then DebugOn "." else DebugOff
-
-            scale = scale
+        let config =
+            Config(
+              { scale = 1.
 
-            // RBC size range in px at scale = 1.0.
-            minRBCSize = 20.
-            maxRBCSize = 42.
+                initialAreaOpen = 2000
 
-            preFilterSigma = 1.5
+                minRbcRadius = -0.32f
+                maxRbcRadius = 0.32f
 
-            factorNbPick = 1.0 // 1.0
-            factorWindowSize = 2.0
+                preFilterSigma = 1.7 // 1.5
 
-            darkStainLevel = 0.4 // Lower -> more sensitive.
+                factorNbPick = 1.0
 
-            stainSigma = 10.
-            stainLevel = 0.9
-            stainSpreadRequired = 3.0
+                darkStainLevel = 0.22 // Lower -> more sensitive. 0.3. Careful about illumination on the borders.
+                maxDarkStainRatio = 0.1 // 10 %
 
-            infectionSigma = 2.2
-            infectionLevel = 0.87
-            infectionPixelsRequired = 1
+                infectionArea = 0.012f // 1.2 %
+                infectionLevel = 1.12 // Lower -> more sensitive.
 
-            percentageOfFgValidCell = 0.4
+                stainArea = 0.08f // 8 %
+                stainLevel = 1.1 // Lower -> more sensitive.
+                maxStainRatio = 0.12 // 12 %
 
-            MaxDarkStainRatio = 0.1
-
-            minimumCellArea = 1000. * scale ** 2. |> int
-            maxOffcenter = 0.5 }
+                standardDeviationMaxRatio = 0.5 // 0.55
+                minimumCellArea = 0.5f })
 
         match mode with
         | CmdLine (input, output) ->
-            let config = if debug then { config with debug = DebugOn output } else config
+            if debug
+            then
+                config.Debug <- DebugOn output
 
             Directory.CreateDirectory output |> ignore
 
@@ -105,22 +104,35 @@ let main args =
 
             use resultFile = new StreamWriter(new FileStream(Path.Combine(output, "results.txt"), FileMode.Append, FileAccess.Write))
 
-            for file in files do
-                try
-                    use img = new Image<Bgr, byte>(file)
-                    Utils.log (sprintf "== File: %A" file)
+            //try
+            let images = seq { for file in files -> Path.GetFileNameWithoutExtension(FileInfo(file).Name), new Image<Bgr, byte>(file) }
+
+            let nbConcurrentTaskLimit = 4
+            let n = Environment.ProcessorCount
 
-                    let cells = Utils.logTime "Whole analyze" (fun () -> ImageAnalysis.doAnalysis img (Path.GetFileNameWithoutExtension(FileInfo(file).Name)) config)
+            Utils.logTime "Whole analyze" (fun () ->
+                let results =
+                    images
+                    |> PSeq.map (fun (id, img) -> id, ImageAnalysis.doAnalysis img id (config.Copy()))
+                    |> PSeq.withDegreeOfParallelism (if n > nbConcurrentTaskLimit then nbConcurrentTaskLimit else n)
+
+                for id, cells in results do
                     let total, infected = Utils.countCells cells
-                    fprintf resultFile "File: %s %d %d %.2f\n" file total infected (100. * (float infected) / (float total))
-                with
-                | :? IOException as ex -> Utils.log (sprintf "Unable to open the image '%A': %A" file ex)
+                    fprintf resultFile "File: %s %d %d %.2f\n" id total infected (100. * (float infected) / (float total)))
+
+            //Utils.log (sprintf "== File: %A" file)
+            //with
+            //| :? IOException as ex -> Utils.log (sprintf "Unable to open the image '%A': %A" file ex)
             0
 
         | Window ->
             let app = new Application()
             let mainWindow = Views.MainWindow()
 
+            if debug
+            then
+                config.Debug <- DebugOn "."
+
             Utils.log <- (fun m -> log mainWindow m)
 
             //display mainWindow img