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

diff --git a/Parasitemia/ParasitemiaCore/Config.fs b/Parasitemia/ParasitemiaCore/Config.fs
index 9df9dc4..385b7d4 100644
--- a/Parasitemia/ParasitemiaCore/Config.fs
+++ b/Parasitemia/ParasitemiaCore/Config.fs
@@ -13,9 +13,6 @@ type Parameters = {
     rbcDiameter: float<μm>
     resolution: float<ppi>
 
-    colorContribution_BG_RBC: float * float * float // (R, G, B).
-    colorContribution_RBC_parasite: float * float * float // (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.
@@ -24,7 +21,6 @@ type Parameters = {
     maxRbcRadius: float32 // Factor of the mean RBC radius.
 
     LPFStandardDeviationParasite: float<μm> // Sigma parameter of the gaussian to remove the high frequency noise.
-    LPFStandardDeviationStain: float<μm>
     LPFStandardDeviationRBC: float<μm>
 
     // Ellipse.
@@ -34,24 +30,21 @@ 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.
+    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).
 
-    infectionArea: float32 // Factor of a RBC area. 0.5 means the half of RBC area.
+    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.
-}
+    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.
 
-    colorContribution_BG_RBC = 0.16, 0.44, 0.4
-    colorContribution_RBC_parasite = 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.
 
     granulometryRange = 0.5f
@@ -60,22 +53,22 @@ let defaultParameters = {
     maxRbcRadius = 0.3f
 
     LPFStandardDeviationParasite = 0.15<μm>
-    LPFStandardDeviationStain = 0.15<μm> // 0.12
-    LPFStandardDeviationRBC = 0.2<μm> // 8.5e-6<inch>. // 0.2<μm>
+    LPFStandardDeviationRBC = 0.2<μm>
 
     factorNbPick = 1.0
 
-    darkStainLevel = 0.25 // 0.3
+    darkStainLevel = 0.25
     maxDarkStainRatio = 0.1 // 10 %
 
-    infectionArea = 0.01f // 0.8 % // 0.012f
-    infectionSensitivity = 0.9 // 1) 0.93, 2) 0.94
+    parasiteRadiusRatio = 0.5f // 40 %
+
+    minimumParasiteAreaRatio = 0.02f // 2 %
+    cytoplasmSensitivity = 0.96
 
-    stainArea = 0.08f // 6 % // 0.08f
-    stainSensitivity = 0.96 //  1) 0.91, 2) 0.92
-    maxStainRatio = 0.12 // 12 %
+    nucleusAreaRatio = 0.01f // 1.0 %
+    infectionSensitivity = 0.92
 
-    standardDeviationMaxRatio = 0.5 // 0.5
+    standardDeviationMaxRatio = 0.6
     minimumCellAreaFactor = 0.4f }
 
 type RBCRadius (radius: float32, parameters: Parameters) =
@@ -89,8 +82,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)
@@ -120,10 +115,6 @@ type Config (param: Parameters) =
         let stdDeviation: float<px> = (μmToInch parameters.LPFStandardDeviationParasite) * parameters.resolution
         float stdDeviation
 
-    member this.LPFStandardDeviationStain =
-        let stdDeviation: float<px> = (μmToInch parameters.LPFStandardDeviationStain) * parameters.resolution
-        float stdDeviation
-
     member this.LPFStandardDeviationRBC =
         let stdDeviation: float<px> = (μmToInch parameters.LPFStandardDeviationRBC) * parameters.resolution
         float stdDeviation