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

diff --git a/Parasitemia/Parasitemia/Config.fs b/Parasitemia/Parasitemia/Config.fs
index 9c23d83..0916408 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,63 @@ 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 RBCRadius (radius: float32, parameters: Parameters) =
+    member this.Pixel = radius
+    member this.μm : float<μm> =
+        1.<px> * (float radius) / parameters.resolution |> inchToμm
+
+    member this.Min = radius + parameters.minRbcRadius * radius
+    member this.Max = radius + parameters.maxRbcRadius * radius
+
+    member this.Area = PI * radius ** 2.f
+    member this.MinArea = parameters.minimumCellAreaFactor * radius
+
+    member this.InfectionArea = parameters.infectionArea * this.Area
+    member this.StainArea = parameters.stainArea * this.Area
+
+    override this.ToString() =
+        sprintf "%d px (%.1f μm)" (Utils.roundInt <| 2.f * radius) (2. * this.μm)
+
+
 type Config (param: Parameters) =
-    let initialRBCRadius : float32 =
-        let rbcRadiusInch: float<inch> = μm.ConvertToInch(param.rbcDiameter) / 2.
-        let rbcRadiusPx: float<px> = param.resolution * rbcRadiusInch
+    let RBCadiusInPixels (rbcDiameter: float<μm>) (resolution: float<ppi>) : float32 =
+        let rbcRadiusInch: float<inch> = (μmToInch rbcDiameter) / 2.
+        let rbcRadiusPx: float<px> = resolution * rbcRadiusInch
         float32 rbcRadiusPx
 
-    member this.Parameters = param
+    let mutable parameters: Parameters = param
+    let mutable rbcRadiusByResolution = RBCRadius(RBCadiusInPixels parameters.rbcDiameter parameters.resolution, parameters)
+    let mutable rbcRadius = RBCRadius(0.f, parameters)
+
+    new () = Config(defaultParameters)
+
+    member this.Parameters
+        with get() = parameters
+        and set(param) =
+            parameters <- param
+            rbcRadiusByResolution <- RBCRadius(RBCadiusInPixels parameters.rbcDiameter parameters.resolution, param)
+            rbcRadius <- RBCRadius(rbcRadius.Pixel, 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) * parameters.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.RBCArea = PI * this.RBCRadius ** 2.f
-    member this.RBCMinArea = param.minimumCellAreaFactor * this.RBCArea
+    member this.RBCRadiusByResolution = rbcRadiusByResolution
+    member this.RBCRadius = rbcRadius
 
-    member this.InfectionArea = param.infectionArea * this.RBCArea
-    member this.StainArea = param.stainArea * this.RBCArea
+    member this.SetRBCRadius (radiusPixel: float32) =
+        rbcRadius <- RBCRadius(radiusPixel, parameters)
 
     member this.Copy () =
         this.MemberwiseClone() :?> Config