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

diff --git a/Parasitemia/Parasitemia/Program.fs b/Parasitemia/Parasitemia/Program.fs
index 711ec6f..038f827 100644
--- a/Parasitemia/Parasitemia/Program.fs
+++ b/Parasitemia/Parasitemia/Program.fs
@@ -46,6 +46,7 @@ let main args =
             Config(
               {
                 initialAreaOpen = 2000
+                ratioSecondAreaOpen = 1.f / 3.f
 
                 minRbcRadius = -0.3f
                 maxRbcRadius = 0.3f
@@ -65,7 +66,7 @@ let main args =
                 maxStainRatio = 0.12 // 12 %
 
                 standardDeviationMaxRatio = 0.5 // 0.55
-                minimumCellArea = 0.5f })
+                minimumCellAreaFactor = 0.5f })
 
         match mode with
         | CmdLine (input, output) ->
@@ -90,9 +91,9 @@ let main args =
 
 
             Utils.logTime "Whole analyze" (fun () ->
-                let results = ImageAnalysis.doMultipleAnalysis images config
+                let results = ImageAnalysis.doMultipleAnalysis images config None
 
-                for id, cells in results do
+                for id, _, cells in results do
                     let total, infected = Utils.countCells cells
                     fprintf resultFile "File: %s %d %d %.2f\n" id total infected (100. * (float infected) / (float total)))