X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FProgram.fs;h=038f827c754aa3deb22f0c08dff0b43b69f17bb3;hp=f0e2748efa741b286c4a4578a3111d1626828afe;hb=807437584bdd3d7b7b33be8282472f81f8cce606;hpb=3ddaf64dc5ba6a7066a279ad75b9a1ee72194639

diff --git a/Parasitemia/Parasitemia/Program.fs b/Parasitemia/Parasitemia/Program.fs
index f0e2748..038f827 100644
--- 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
 
@@ -48,6 +46,7 @@ let main args =
             Config(
               {
                 initialAreaOpen = 2000
+                ratioSecondAreaOpen = 1.f / 3.f
 
                 minRbcRadius = -0.3f
                 maxRbcRadius = 0.3f
@@ -56,7 +55,7 @@ let main args =
 
                 factorNbPick = 1.0
 
-                darkStainLevel = 0.25 // Lower -> more sensitive. 0.3. Careful about illumination on the borders.
+                darkStainLevel = 0.25 // 0.3
                 maxDarkStainRatio = 0.1 // 10 %
 
                 infectionArea = 0.012f // 1.2 %
@@ -67,7 +66,7 @@ let main args =
                 maxStainRatio = 0.12 // 12 %
 
                 standardDeviationMaxRatio = 0.5 // 0.55
-                minimumCellArea = 0.5f })
+                minimumCellAreaFactor = 0.5f })
 
         match mode with
         | CmdLine (input, output) ->
@@ -88,18 +87,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)))
 
@@ -118,4 +112,4 @@ let main args =
                txtLog.Text <- txtLog.Text + mess + "\n"*)
 
             if debug then config.Debug <- DebugOn "."
-            GUI.run config
+            GUI.Main.run config