X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FConfig.fs;h=1110096ea4d826ec40277263f4a5cd59fcec8d52;hp=9df9dc49dc635e2c80ac3d24a6ee66eaad71ac01;hb=3b645f8ff5259f88a33ffbd9a63b10a8640c439f;hpb=db49e167a602ef1df02a8b5f7de334355a4917dd

diff --git a/Parasitemia/ParasitemiaCore/Config.fs b/Parasitemia/ParasitemiaCore/Config.fs
index 9df9dc4..1110096 100644
--- a/Parasitemia/ParasitemiaCore/Config.fs
+++ b/Parasitemia/ParasitemiaCore/Config.fs
@@ -34,11 +34,12 @@ type Parameters = {
     darkStainLevel: float // Lower -> more sensitive. Careful about illumination on the borders.
     maxDarkStainRatio: float // When a cell must own less than this ratio to be a RBC.
 
-    stainArea: float32 // Factor of a RBC area. 0.5 means the half of RBC area.
-    stainSensitivity: float // between 0 (the least sensitive) and 1 (the most sensitive).
-    maxStainRatio: float // A cell must own less than this ratio to be a RBC.
+    parasiteRadiusRatio: float32 // The ratio of the parasite radius of the RBC radius.
 
-    infectionArea: float32 // Factor of a RBC area. 0.5 means the half of RBC area.
+    minimumParasiteAreaRatio: float32 // Factor of a RBC area. 0.5 means the half of RBC area.
+    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
@@ -49,8 +50,8 @@ let defaultParameters = {
     rbcDiameter = 8.<μm>
     resolution = 220.e3<ppi> // 220.e3<ppi> Correspond to 50X.
 
-    colorContribution_BG_RBC = 0.16, 0.44, 0.4
-    colorContribution_RBC_parasite = 0.54, 0.41, 0.05
+    colorContribution_BG_RBC = (* 0., 1., 0. *) 0.16, 0.44, 0.4
+    colorContribution_RBC_parasite = (* 1., 0., 0. *) 0.54, 0.41, 0.05
 
     ratioAreaPaleCenter = 2.f / 5.f // The ratio between an RBC area and the area of the its pale center.
 
@@ -68,12 +69,13 @@ let defaultParameters = {
     darkStainLevel = 0.25 // 0.3
     maxDarkStainRatio = 0.1 // 10 %
 
-    infectionArea = 0.01f // 0.8 % // 0.012f
-    infectionSensitivity = 0.9 // 1) 0.93, 2) 0.94
+    parasiteRadiusRatio = 0.5f // 40 %
 
-    stainArea = 0.08f // 6 % // 0.08f
-    stainSensitivity = 0.96 //  1) 0.91, 2) 0.92
-    maxStainRatio = 0.12 // 12 %
+    minimumParasiteAreaRatio = 0.02f // 2 %
+    cytoplasmSensitivity = 0.96 //  1) 0.91, 2) 0.92
+
+    nucleusAreaRatio = 0.01f // 1.0 %
+    infectionSensitivity = 0.9 // 1) 0.93, 2) 0.94
 
     standardDeviationMaxRatio = 0.5 // 0.5
     minimumCellAreaFactor = 0.4f }
@@ -89,8 +91,10 @@ type RBCRadius (radius: float32, parameters: Parameters) =
     member this.Area = PI * radius ** 2.f
     member this.MinArea = parameters.minimumCellAreaFactor * this.Area
 
-    member this.InfectionArea = parameters.infectionArea * this.Area
-    member this.StainArea = parameters.stainArea * this.Area
+    member this.ParasiteRadius = parameters.parasiteRadiusRatio * radius
+
+    member this.NucleusArea = parameters.nucleusAreaRatio * this.Area
+    member this.MinimumParasiteArea = parameters.minimumParasiteAreaRatio * this.Area
 
     override this.ToString() =
         sprintf "%d px (%.1f μm)" (Utils.roundInt <| 2.f * radius) (2. * this.μm)