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

diff --git a/Parasitemia/Parasitemia/Program.fs b/Parasitemia/Parasitemia/Program.fs
index 711ec6f..2dcd2ff 100644
--- a/Parasitemia/Parasitemia/Program.fs
+++ b/Parasitemia/Parasitemia/Program.fs
@@ -42,30 +42,7 @@ let parseArgs (args: string[]) : Arguments =
 let main args =
     match parseArgs args with
     | mode, debug ->
-        let config =
-            Config(
-              {
-                initialAreaOpen = 2000
-
-                minRbcRadius = -0.3f
-                maxRbcRadius = 0.3f
-
-                preFilterSigma = 1.7 // 1.5
-
-                factorNbPick = 1.0
-
-                darkStainLevel = 0.25 // 0.3
-                maxDarkStainRatio = 0.1 // 10 %
-
-                infectionArea = 0.012f // 1.2 %
-                infectionLevel = 1.12 // Lower -> more sensitive.
-
-                stainArea = 0.08f // 8 %
-                stainLevel = 1.1 // Lower -> more sensitive.
-                maxStainRatio = 0.12 // 12 %
-
-                standardDeviationMaxRatio = 0.5 // 0.55
-                minimumCellArea = 0.5f })
+        let config = Config(defaultParameters)
 
         match mode with
         | CmdLine (input, output) ->
@@ -86,11 +63,11 @@ let main args =
             use resultFile = new StreamWriter(new FileStream(Path.Combine(output, "results.txt"), FileMode.Append, FileAccess.Write))
 
             //try
-            let images = [ 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), config.Copy(), new Image<Bgr, byte>(file) ]
 
 
             Utils.logTime "Whole analyze" (fun () ->
-                let results = ImageAnalysis.doMultipleAnalysis images config
+                let results = ImageAnalysis.doMultipleAnalysis images None
 
                 for id, cells in results do
                     let total, infected = Utils.countCells cells