Change the way the dark stain is marked.

[master-thesis.git] / Parasitemia / ParasitemiaCore / Config.fs

diff --git a/Parasitemia/ParasitemiaCore/Config.fs b/Parasitemia/ParasitemiaCore/Config.fs
index 5e3280c..21a36f9 100644 (file)
--- a/Parasitemia/ParasitemiaCore/Config.fs
+++ b/Parasitemia/ParasitemiaCore/Config.fs
@@ -24,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.
@@ -33,6 +35,7 @@ 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.
@@ -55,14 +58,17 @@ let defaultParameters = {
     LPFStandardDeviationParasite = 0.15<μ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 %
+
+    cytoplasmSizeRatio = 1.f / 5.f
     cytoplasmSensitivity = 0.96
 
     nucleusAreaRatio = 0.01f // 1.0 %
@@ -83,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