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

diff --git a/Parasitemia/ParasitemiaCore/Config.fs b/Parasitemia/ParasitemiaCore/Config.fs
index 5fdcd0d..385b7d4 100644
--- a/Parasitemia/ParasitemiaCore/Config.fs
+++ b/Parasitemia/ParasitemiaCore/Config.fs
@@ -20,7 +20,8 @@ type Parameters = {
     minRbcRadius: float32 // Factor of the mean RBC radius.
     maxRbcRadius: float32 // Factor of the mean RBC radius.
 
-    LPFStandardDeviation: float<μm> // Sigma parameter of the gaussian to remove the high frequency noise.
+    LPFStandardDeviationParasite: float<μm> // Sigma parameter of the gaussian to remove the high frequency noise.
+    LPFStandardDeviationRBC: float<μm>
 
     // Ellipse.
     factorNbPick: float // The number of computed ellipse per edge pixel.
@@ -29,43 +30,45 @@ 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.
 
-    infectionArea: 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
-    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>
-    resolution = 220.e3<ppi> // Correspond to 50X.
+    rbcDiameter = 7.5<μm>
+    resolution = 220.e3<ppi> // 220.e3<ppi> Correspond to 50X.
 
-    ratioAreaPaleCenter = 1.f / 3.f // The ratio between an RBC area and the area of the its pale center.
+    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
 
-    LPFStandardDeviation = 0.2<μm> // 8.5e-6<inch>.
+    LPFStandardDeviationParasite = 0.15<μm>
+    LPFStandardDeviationRBC = 0.2<μm>
 
     factorNbPick = 1.0
 
-    darkStainLevel = 0.25 // 0.3
+    darkStainLevel = 0.25
     maxDarkStainRatio = 0.1 // 10 %
 
-    infectionArea = 0.012f // 1.2 %
-    infectionSensitivity = 0.9
+    parasiteRadiusRatio = 0.5f // 40 %
+
+    minimumParasiteAreaRatio = 0.02f // 2 %
+    cytoplasmSensitivity = 0.96
 
-    stainArea = 0.08f // 8 %
-    stainSensitivity = 0.9
-    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) =
@@ -77,10 +80,12 @@ type RBCRadius (radius: float32, parameters: Parameters) =
     member this.Max = radius + parameters.maxRbcRadius * radius
 
     member this.Area = PI * radius ** 2.f
-    member this.MinArea = parameters.minimumCellAreaFactor * radius
+    member this.MinArea = parameters.minimumCellAreaFactor * this.Area
+
+    member this.ParasiteRadius = parameters.parasiteRadiusRatio * radius
 
-    member this.InfectionArea = parameters.infectionArea * this.Area
-    member this.StainArea = parameters.stainArea * this.Area
+    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)
@@ -106,8 +111,12 @@ type Config (param: Parameters) =
 
     member val Debug = DebugOff with get, set
 
-    member this.LPFStandardDeviation =
-        let stdDeviation: float<px> = (μmToInch parameters.LPFStandardDeviation) * parameters.resolution
+    member this.LPFStandardDeviationParasite =
+        let stdDeviation: float<px> = (μmToInch parameters.LPFStandardDeviationParasite) * parameters.resolution
+        float stdDeviation
+
+    member this.LPFStandardDeviationRBC =
+        let stdDeviation: float<px> = (μmToInch parameters.LPFStandardDeviationRBC) * parameters.resolution
         float stdDeviation
 
     member this.RBCRadiusByResolution = rbcRadiusByResolution