X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FConfig.fs;h=e28398e57ebc752dedd0da251cc595151512e32b;hp=9c23d83eec23ae985a2006ec001d352f3649ee92;hb=ee562c3b613791fd89a5c322546229e9d364cafb;hpb=4147bfad3c85dcf4fe7d291abf7d356379d88b4f

diff --git a/Parasitemia/Parasitemia/Config.fs b/Parasitemia/Parasitemia/Config.fs
index 9c23d83..e28398e 100644
--- a/Parasitemia/Parasitemia/Config.fs
+++ b/Parasitemia/Parasitemia/Config.fs
@@ -30,14 +30,14 @@ type Parameters = {
     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.
-    stainLevel: float // > 1
-    maxStainRatio: float // When a cell must own less than this ratio to be a RBC.
+    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.
 
     infectionArea: float32 // Factor of a RBC area. 0.5 means the half of RBC area.
-    infectionLevel: float // > 1
+    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.
+    minimumCellAreaFactor: float32 // Factor of the mean RBC area. A cell with an area below this will be rejected.
 }
 
 let defaultParameters = {
@@ -59,39 +59,49 @@ let defaultParameters = {
     maxDarkStainRatio = 0.1 // 10 %
 
     infectionArea = 0.012f // 1.2 %
-    infectionLevel = 1.12 // Lower -> more sensitive.
+    infectionSensitivity = 0.9
 
     stainArea = 0.08f // 8 %
-    stainLevel = 1.1 // Lower -> more sensitive.
+    stainSensitivity = 0.9
     maxStainRatio = 0.12 // 12 %
 
     standardDeviationMaxRatio = 0.5 // 0.5
     minimumCellAreaFactor = 0.4f }
 
 type Config (param: Parameters) =
+    let mutable parameters: Parameters = param
+
     let initialRBCRadius : float32 =
-        let rbcRadiusInch: float<inch> = μm.ConvertToInch(param.rbcDiameter) / 2.
-        let rbcRadiusPx: float<px> = param.resolution * rbcRadiusInch
+        let rbcRadiusInch: float<inch> = (μmToInch parameters.rbcDiameter) / 2.
+        let rbcRadiusPx: float<px> = parameters.resolution * rbcRadiusInch
         float32 rbcRadiusPx
 
-    member this.Parameters = param
+    new () = Config(defaultParameters)
+
+    member this.Parameters with get() = parameters and set(param) = parameters <- param
     member val Debug = DebugOff with get, set
 
     member this.LPFStandardDeviation =
-        let stdDeviation: float<px> = μm.ConvertToInch(param.LPFStandardDeviation) * param.resolution
+        let stdDeviation: float<px> = (μmToInch parameters.LPFStandardDeviation) * param.resolution
         float stdDeviation
 
     // Mean RBC radius.
     member val RBCRadius : float32 = initialRBCRadius with get, set
 
-    member this.RBCMinRadius = this.RBCRadius + param.minRbcRadius * this.RBCRadius
-    member this.RBCMaxRadius = this.RBCRadius + param.maxRbcRadius * this.RBCRadius
+    member this.RBCRadiusμm : float<μm> =
+        1.<px> * (float this.RBCRadius) / parameters.resolution |> inchToμm
+
+    member this.RBCMinRadius = this.RBCRadius + parameters.minRbcRadius * this.RBCRadius
+    member this.RBCMaxRadius = this.RBCRadius + parameters.maxRbcRadius * this.RBCRadius
 
     member this.RBCArea = PI * this.RBCRadius ** 2.f
-    member this.RBCMinArea = param.minimumCellAreaFactor * this.RBCArea
+    member this.RBCMinArea = parameters.minimumCellAreaFactor * this.RBCArea
+
+    member this.InfectionArea = parameters.infectionArea * this.RBCArea
+    member this.StainArea = parameters.stainArea * this.RBCArea
 
-    member this.InfectionArea = param.infectionArea * this.RBCArea
-    member this.StainArea = param.stainArea * this.RBCArea
+    member this.FormattedRadius =
+        sprintf "%d px (%.1f μm)" (Utils.roundInt <| 2.f * this.RBCRadius) (2. * this.RBCRadiusμm)
 
     member this.Copy () =
         this.MemberwiseClone() :?> Config