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

diff --git a/Parasitemia/ParasitemiaCore/Config.fs b/Parasitemia/ParasitemiaCore/Config.fs
index 3089953..18c64cc 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.
@@ -28,7 +24,9 @@ type Parameters = {
     LPFStandardDeviationRBC: float<μm>
 
     // Ellipse.
-    factorNbPick: float // The number of computed ellipse per edge pixel.
+    nbPickElementsMin: int
+    factorNbValidPick: float // The number of computed ellipse per edge pixel.
+    factorNbMaxPick: float
 
     // Parasites detection.
     darkStainLevel: float // Lower -> more sensitive. Careful about illumination on the borders.
@@ -37,51 +35,46 @@ type Parameters = {
     parasiteRadiusRatio: float32 // The ratio of the parasite radius of the RBC radius.
     minimumParasiteAreaRatio: float32 // Factor of a RBC area. 0.5 means the half of RBC area.
 
+    cytoplasmSizeRatio: float32
     cytoplasmSensitivity: float // between 0 (the least sensitive) and 1 (the most sensitive).
 
     nucleusAreaRatio: float32 // Factor of a RBC area. 0.5 means the half of RBC area.
     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.
-}
+    // [<Obsolete>] 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.
 
 let defaultParameters = {
-    rbcDiameter = 8.<μ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*)
+    rbcDiameter = 7.5<μm>
+    resolution = 230.e3<ppi> // 230.e3<ppi> Correspond to 50X.
 
     ratioAreaPaleCenter = 2.f / 5.f // The ratio between an RBC area and the area of the its pale center.
 
     granulometryRange = 0.5f
 
-    minRbcRadius = -0.3f
-    maxRbcRadius = 0.3f
+    minRbcRadius = -0.23f
+    maxRbcRadius = 0.23f
 
     LPFStandardDeviationParasite = 0.15<μm>
-    LPFStandardDeviationRBC = 0.2<μm>
+    LPFStandardDeviationRBC = 0.22<μm>
 
-    factorNbPick = 1.0
+    nbPickElementsMin = 10
+    factorNbValidPick = 0.06 //1.0
+    factorNbMaxPick = 4.
 
-    darkStainLevel = 0.25
+    darkStainLevel = 1.1
     maxDarkStainRatio = 0.1 // 10 %
 
-    parasiteRadiusRatio = 0.5f // 40 %
-
+    parasiteRadiusRatio = 0.5f // 50 %
     minimumParasiteAreaRatio = 0.02f // 2 %
-    cytoplasmSensitivity = 0.96 //  1) 0.91, 2) 0.92
+
+    cytoplasmSizeRatio = 1.f / 5.f
+    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 // Obsolete.
     minimumCellAreaFactor = 0.4f }
 
 type RBCRadius (radius: float32, parameters: Parameters) =
@@ -96,6 +89,7 @@ type RBCRadius (radius: float32, parameters: Parameters) =
     member this.MinArea = parameters.minimumCellAreaFactor * this.Area
 
     member this.ParasiteRadius = parameters.parasiteRadiusRatio * radius
+    member this.CytoplasmSize = parameters.cytoplasmSizeRatio * radius
 
     member this.NucleusArea = parameters.nucleusAreaRatio * this.Area
     member this.MinimumParasiteArea = parameters.minimumParasiteAreaRatio * this.Area