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

diff --git a/Parasitemia/Parasitemia/Program.fs b/Parasitemia/Parasitemia/Program.fs
index ac17c82..86de435 100644
--- a/Parasitemia/Parasitemia/Program.fs
+++ b/Parasitemia/Parasitemia/Program.fs
@@ -65,51 +65,56 @@ let main args =
 
             // RBC size range in px at scale = 1.0.
             minRBCSize = 20.
-            maxRBCSize = 40.
+            maxRBCSize = 42.
 
-            doGSigma1 = 1.5
-            doGSigma2 = 20.
-            doGLowFreqPercentageReduction = 0.75
+            preFilterSigma = 1.5
 
-            darkStainLevel = 0.5
+            factorNbPick = 1.0 // 1.0
+            factorWindowSize = 2.0
+
+            darkStainLevel = 0.4 // Lower -> more sensitive.
 
             stainSigma = 10.
             stainLevel = 0.9
             stainSpreadRequired = 3.0
 
             infectionSigma = 2.2
-            infectionLevel = 0.85
+            infectionLevel = 0.87
             infectionPixelsRequired = 1
 
             percentageOfFgValidCell = 0.4
 
             MaxDarkStainRatio = 0.1
 
-            minimumCellArea = 600. * scale ** 2. |> int
+            minimumCellArea = 1000. * scale ** 2. |> int
             maxOffcenter = 0.5 }
 
         match mode with
         | CmdLine (input, output) ->
-            let config = { config with debug = DebugOn output }
-            Utils.log <- (fun m -> Console.WriteLine m)
+            let config = if debug then { config with debug = DebugOn output } else config
 
             Directory.CreateDirectory output |> ignore
 
+            use logFile = new StreamWriter(new FileStream(Path.Combine(output, "log.txt"), FileMode.Append, FileAccess.Write))
+            Utils.log <- (fun m -> logFile.WriteLine(m))
+            Utils.log (sprintf "=== New run : %A %A ===" DateTime.Now  (if debug then "[DEBUG]" else "[RELEASE]"))
+
             let files = match input with
                         | File file -> [ file ]
                         | Dir dir -> Directory.EnumerateFiles dir |> List.ofSeq
 
-            use resultFile = new StreamWriter(new FileStream(Path.Combine(output, "results.txt"), FileMode.Create, FileAccess.Write))
+            use resultFile = new StreamWriter(new FileStream(Path.Combine(output, "results.txt"), FileMode.Append, FileAccess.Write))
 
             for file in files do
                 try
-                    let fileInfo = FileInfo(file)
                     use img = new Image<Bgr, byte>(file)
-                    let cells = Utils.logTime "Whole analyze" (fun () -> ImageAnalysis.doAnalysis img fileInfo.Name config)
+                    Utils.log (sprintf "== File: %A" file)
+
+                    let cells = Utils.logTime "Whole analyze" (fun () -> ImageAnalysis.doAnalysis img (Path.GetFileNameWithoutExtension(FileInfo(file).Name)) config)
                     let total, infected = Utils.countCells cells
                     fprintf resultFile "File: %s %d %d %.2f\n" file total infected (100. * (float infected) / (float total))
                 with
-                | _ as ex -> Utils.log (sprintf "Unable to open the image '%A': %A" file ex)
+                | :? IOException as ex -> Utils.log (sprintf "Unable to open the image '%A': %A" file ex)
             0
 
         | Window ->