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

diff --git a/Parasitemia/Parasitemia/Program.fs b/Parasitemia/Parasitemia/Program.fs
index 86de435..dffc8fd 100644
--- a/Parasitemia/Parasitemia/Program.fs
+++ b/Parasitemia/Parasitemia/Program.fs
@@ -57,41 +57,36 @@ 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
+                minRbcRadius = -0.32
+                maxRbcRadius = 0.32
 
-            // RBC size range in px at scale = 1.0.
-            minRBCSize = 20.
-            maxRBCSize = 42.
+                preFilterSigma = 1.7 // 1.5
 
-            preFilterSigma = 1.5
+                factorNbPick = 1.0
+                factorWindowSize = 2.0
 
-            factorNbPick = 1.0 // 1.0
-            factorWindowSize = 2.0
+                darkStainLevel = 0.25 // Lower -> more sensitive. 0.3
+                maxDarkStainRatio = 0.1
 
-            darkStainLevel = 0.4 // Lower -> more sensitive.
+                infectionArea = 0.012 // 1.2 %
+                infectionLevel = 1.12 // Lower -> more sensitive.
 
-            stainSigma = 10.
-            stainLevel = 0.9
-            stainSpreadRequired = 3.0
+                stainArea = 0.08 // 8 %
+                stainLevel = 1.1 // Lower -> more sensitive.
+                maxStainRatio = 0.12 // 12 %
 
-            infectionSigma = 2.2
-            infectionLevel = 0.87
-            infectionPixelsRequired = 1
-
-            percentageOfFgValidCell = 0.4
-
-            MaxDarkStainRatio = 0.1
-
-            minimumCellArea = 1000. * scale ** 2. |> int
-            maxOffcenter = 0.5 }
+                standardDeviationMaxRatio = 0.58 // 0.55
+                minimumCellArea = 0.5 })
 
         match mode with
         | CmdLine (input, output) ->
-            let config = if debug then { config with debug = DebugOn output } else config
+            if debug
+            then
+                config.Debug <- DebugOn output
 
             Directory.CreateDirectory output |> ignore
 
@@ -121,6 +116,10 @@ let main args =
             let app = new Application()
             let mainWindow = Views.MainWindow()
 
+            if debug
+            then
+                config.Debug <- DebugOn "."
+
             Utils.log <- (fun m -> log mainWindow m)
 
             //display mainWindow img