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

diff --git a/Parasitemia/Parasitemia/Program.fs b/Parasitemia/Parasitemia/Program.fs
index f0e2748..711ec6f 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
 
@@ -56,7 +54,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 %
@@ -88,16 +86,11 @@ 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
 
                 for id, cells in results do
                     let total, infected = Utils.countCells cells
@@ -118,4 +111,4 @@ let main args =
                txtLog.Text <- txtLog.Text + mess + "\n"*)
 
             if debug then config.Debug <- DebugOn "."
-            GUI.run config
+            GUI.Main.run config