X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FProgram.fs;h=103596a0627831cf7898e717f24271bc7d7c0400;hp=d7348cfc31cba8fdd6d33564bcf4d8fd66bc35df;hb=84fdf7404133803fdf0dc867a4da68a144975191;hpb=8cf3b0a302943312c588690b4e4c90af17b3e87a

diff --git a/Parasitemia/Parasitemia/Program.fs b/Parasitemia/Parasitemia/Program.fs
index d7348cf..103596a 100644
--- a/Parasitemia/Parasitemia/Program.fs
+++ b/Parasitemia/Parasitemia/Program.fs
@@ -57,49 +57,42 @@ 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.3
+                maxRbcRadius = 0.3
 
-            // RBC size range in px at scale = 1.0.
-            minRBCSize = 20.
-            maxRBCSize = 40.
+                preFilterSigma = 1.5
 
-            doGSigma1 = 1.5
-            doGSigma2 = 20.
-            doGLowFreqPercentageReduction = 0.75
+                factorNbPick = 1.0
+                factorWindowSize = 2.0
 
-            factorNbPick = 2.0
-            factorWindowSize = 1.6
+                darkStainLevel = 0.4 // Lower -> more sensitive.
 
-            darkStainLevel = 0.4 // Lower -> more sensitive.
+                stainArea = 0.02
+                stainLevel = 0.2
 
-            stainSigma = 10.
-            stainLevel = 0.9
-            stainSpreadRequired = 3.0
+                infectionArea = 0.06
+                infectionLevel = 0.2
+                infectionPixelsRequired = 1
 
-            infectionSigma = 2.2
-            infectionLevel = 0.85
-            infectionPixelsRequired = 1
+                maxDarkStainRatio = 0.1
 
-            percentageOfFgValidCell = 0.4
-
-            MaxDarkStainRatio = 0.1
-
-            minimumCellArea = 1200. * scale ** 2. |> int
-            maxOffcenter = 0.5 }
+                minimumCellArea = 0.3 })
 
         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,7 +104,8 @@ 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
@@ -122,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