X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FConfig.fs;h=385b7d4a91fcbfb477fcaf47ec483d33896a9cd7;hp=308995393fc6474cf3d220f4fc442c840047d4af;hb=23466ba92c5595f6c0b9f97c86a221a4e5ffebe9;hpb=828e126c88524d3dc123abc966a132532aed118b

diff --git a/Parasitemia/ParasitemiaCore/Config.fs b/Parasitemia/ParasitemiaCore/Config.fs
index 3089953..385b7d4 100644
--- a/Parasitemia/ParasitemiaCore/Config.fs
+++ b/Parasitemia/ParasitemiaCore/Config.fs
@@ -13,10 +13,6 @@ type Parameters = {
     rbcDiameter: float<μm>
     resolution: float<ppi>
 
-    averageColor_BG: float32 * float32 * float32 // R * G * B.
-    averageColor_RBC: float32 * float32 * float32 // R * G * B.
-    averageColor_Parasite: float32 * float32 * float32 // R * G * B.
-
     ratioAreaPaleCenter: float32 // The area of the second opening is 'ratioSecondAreaOpen' * mean RBC area. It's applied only if greater than 'initialAreaOpen'.
 
     granulometryRange: float32 // The radius will be seeked from radius - granulometryRange * radius to radius + granulometryRange * radius.
@@ -43,21 +39,12 @@ type Parameters = {
     infectionSensitivity: float // between 0 (the least sensitive) and 1 (the most sensitive).
 
     standardDeviationMaxRatio: float // The standard deviation of the pixel values of a cell can't be greater than standardDeviationMaxRatio * global standard deviation
-    minimumCellAreaFactor: float32 // Factor of the mean RBC area. A cell with an area below this will be rejected.
-}
+    minimumCellAreaFactor: float32 } // Factor of the mean RBC area. A cell with an area below this will be rejected.
 
 let defaultParameters = {
-    rbcDiameter = 8.<μm>
+    rbcDiameter = 7.5<μm>
     resolution = 220.e3<ppi> // 220.e3<ppi> Correspond to 50X.
 
-    averageColor_BG = 113.3f, 135.3f, 150.3f
-    averageColor_RBC = 94.7f, 80.7f, 99.3f
-    averageColor_Parasite = 76.f, 58.f, 94.f
-
-    (*averageColor_BG = 179.f, 148.f, 121.f
-    averageColor_RBC = 141.f, 96.f, 83.f
-    averageColor_Parasite = 123.f, 89.f, 83.f*)
-
     ratioAreaPaleCenter = 2.f / 5.f // The ratio between an RBC area and the area of the its pale center.
 
     granulometryRange = 0.5f
@@ -76,12 +63,12 @@ let defaultParameters = {
     parasiteRadiusRatio = 0.5f // 40 %
 
     minimumParasiteAreaRatio = 0.02f // 2 %
-    cytoplasmSensitivity = 0.96 //  1) 0.91, 2) 0.92
+    cytoplasmSensitivity = 0.96
 
     nucleusAreaRatio = 0.01f // 1.0 %
-    infectionSensitivity = 0.9 // 1) 0.93, 2) 0.94
+    infectionSensitivity = 0.92
 
-    standardDeviationMaxRatio = 0.5 // 0.5
+    standardDeviationMaxRatio = 0.6
     minimumCellAreaFactor = 0.4f }
 
 type RBCRadius (radius: float32, parameters: Parameters) =