Use real unit (um and ppi) instead of pixel in the parameters.

[master-thesis.git] / Parasitemia / Parasitemia / Program.fs

diff --git a/Parasitemia/Parasitemia/Program.fs b/Parasitemia/Parasitemia/Program.fs
index bb61f4f..2aa3ee4 100644 (file)
--- a/Parasitemia/Parasitemia/Program.fs
+++ b/Parasitemia/Parasitemia/Program.fs
@@ -4,8 +4,6 @@ open System
 open System.IO
 open System.Threading
 
-open FSharp.Collections.ParallelSeq
-
 open Emgu.CV
 open Emgu.CV.Structure
 
@@ -44,30 +42,7 @@ let parseArgs (args: string[]) : Arguments =
 let main args =
     match parseArgs args with
     | mode, debug ->
-        let config =
-            Config(
-              {
-                initialAreaOpen = 2000
-
-                minRbcRadius = -0.3f
-                maxRbcRadius = 0.3f
-
-                preFilterSigma = 1.7 // 1.5
-
-                factorNbPick = 1.0
-
-                darkStainLevel = 0.25 // Lower -> more sensitive. 0.3. Careful about illumination on the borders.
-                maxDarkStainRatio = 0.1 // 10 %
-
-                infectionArea = 0.012f // 1.2 %
-                infectionLevel = 1.12 // Lower -> more sensitive.
-
-                stainArea = 0.08f // 8 %
-                stainLevel = 1.1 // Lower -> more sensitive.
-                maxStainRatio = 0.12 // 12 %
-
-                standardDeviationMaxRatio = 0.5 // 0.55
-                minimumCellArea = 0.5f })
+        let config = Config(defaultParameters)
 
         match mode with
         | CmdLine (input, output) ->
@@ -88,18 +63,13 @@ let main args =
             use resultFile = new StreamWriter(new FileStream(Path.Combine(output, "results.txt"), FileMode.Append, FileAccess.Write))
 
             //try
-            let images = seq { for file in files -> Path.GetFileNameWithoutExtension(FileInfo(file).Name), new Image<Bgr, byte>(file) }
+            let images = [ for file in files -> Path.GetFileNameWithoutExtension(FileInfo(file).Name), new Image<Bgr, byte>(file) ]
 
-            let nbConcurrentTaskLimit = 4
-            let n = Environment.ProcessorCount
 
             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)
+                let results = ImageAnalysis.doMultipleAnalysis images config None
 
-                for id, cells in results do
+                for id, _, cells in results do
                     let total, infected = Utils.countCells cells
                     fprintf resultFile "File: %s %d %d %.2f\n" id total infected (100. * (float infected) / (float total)))