X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FProgram.fs;h=6531da82fce59908bda470c5bd61489d50cc8dd1;hp=f23cd3913aea1f1d539045259a0ee25bf8c11050;hb=53440e757b4a4ab2a81b0f6a5dd1a2002c0133ba;hpb=10afa9a402eb88c8e073fe8b0d607faa25230eef

diff --git a/Parasitemia/Parasitemia/Program.fs b/Parasitemia/Parasitemia/Program.fs
index f23cd39..6531da8 100644
--- a/Parasitemia/Parasitemia/Program.fs
+++ b/Parasitemia/Parasitemia/Program.fs
@@ -57,49 +57,44 @@ 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
+        let config =
+            Config(
+              { scale = 1.
 
-            scale = scale
+                initialAreaOpen = 2000
 
-            // RBC size range in px at scale = 1.0.
-            minRBCSize = 20.
-            maxRBCSize = 40.
+                minRbcRadius = -0.32
+                maxRbcRadius = 0.32
 
-            doGSigma1 = 1.5
-            doGSigma2 = 20.
-            doGLowFreqPercentageReduction = 0.75
+                preFilterSigma = 1.7 // 1.5
 
-            factorNbPick = 2.0
-            factorWindowSize = 1.6
+                factorNbPick = 1.0
+                factorWindowSize = 2.0
 
-            darkStainLevel = 0.4 // Lower -> more sensitive.
+                darkStainLevel = 0.25 // Lower -> more sensitive. 0.3
+                maxDarkStainRatio = 0.1 // 10 %
 
-            stainSigma = 10.
-            stainLevel = 0.9
-            stainSpreadRequired = 3.0
+                infectionArea = 0.012 // 1.2 %
+                infectionLevel = 1.12 // Lower -> more sensitive.
 
-            infectionSigma = 2.2
-            infectionLevel = 0.85
-            infectionPixelsRequired = 1
+                stainArea = 0.08 // 8 %
+                stainLevel = 1.1 // Lower -> more sensitive.
+                maxStainRatio = 0.12 // 12 %
 
-            percentageOfFgValidCell = 0.4
-
-            MaxDarkStainRatio = 0.1
-
-            minimumCellArea = 1200. * scale ** 2. |> int
-            maxOffcenter = 0.5 }
+                standardDeviationMaxRatio = 0.5 // 0.55
+                minimumCellArea = 0.5 })
 
         match mode with
         | CmdLine (input, output) ->
-            let config = { config with debug = DebugOn output }
+            if debug
+            then
+                config.Debug <- DebugOn output
 
             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 ===" DateTime.Now)
+            Utils.log (sprintf "=== New run : %A %A ===" DateTime.Now  (if debug then "[DEBUG]" else "[RELEASE]"))
 
             let files = match input with
                         | File file -> [ file ]
@@ -111,17 +106,22 @@ let main args =
                 try
                     use img = new Image<Bgr, byte>(file)
                     Utils.log (sprintf "== File: %A" file)
-                    let cells = Utils.logTime "Whole analyze" (fun () -> ImageAnalysis.doAnalysis img (FileInfo(file).Name) config)
+
+                    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 ->
             let app = new Application()
             let mainWindow = Views.MainWindow()
 
+            if debug
+            then
+                config.Debug <- DebugOn "."
+
             Utils.log <- (fun m -> log mainWindow m)
 
             //display mainWindow img