X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FConfig.fs;h=5740e8b98efa3e8b721282b54bf8151d9b6b62dc;hb=bef2e9f0bf1bba21d4c988fdf654c2dc303ec34a;hp=55e142cd200efccfd8c402a67d784454a01d6b0d;hpb=84fdf7404133803fdf0dc867a4da68a144975191;p=master-thesis.git

diff --git a/Parasitemia/Parasitemia/Config.fs b/Parasitemia/Parasitemia/Config.fs
index 55e142c..5740e8b 100644
--- a/Parasitemia/Parasitemia/Config.fs
+++ b/Parasitemia/Parasitemia/Config.fs
@@ -20,28 +20,29 @@ type Parameters = {
 
     // Parasites detection.
     darkStainLevel: float
+    maxDarkStainRatio: float
 
     stainArea: float // Factor of a RBC area. 0.5 means the half of RBC area.
-    stainLevel: float // [0, 1]
+    stainLevel: float // > 1
+    maxStainRatio: float // [0, 1]
 
     infectionArea: float // Factor of a RBC area. 0.5 means the half of RBC area.
-    infectionLevel: float // [0, 1]
-    infectionPixelsRequired: int
-
-    maxDarkStainRatio: float
+    infectionLevel: float // > 1
 
-    minimumCellArea: float // Factor of RBC area.
+    standardDeviationMaxRatio: float // The standard deviation of the pixel values of a cell can't be greater than standardDeviationMaxRatio * global standard deviation
+    minimumCellArea: float // Factor of the nominal RBC area.
 }
 
 type Config (param: Parameters) =
     member this.Parameters = param
     member val Debug = DebugOff with get, set
-    member val RBCSize = 30. with get, set
+    member val RBCRadius = 30. with get, set
 
-    member this.RBCMin = this.RBCSize + param.minRbcRadius * this.RBCSize
-    member this.RBCMax = this.RBCSize + param.maxRbcRadius * this.RBCSize
+    member this.RBCMinRadius = this.RBCRadius + param.minRbcRadius * this.RBCRadius
+    member this.RBCMaxRadius = this.RBCRadius + param.maxRbcRadius * this.RBCRadius
 
-    member this.RBCMinArea = param.minimumCellArea * Math.PI * this.RBCSize ** 2.0
+    member this.RBCArea = Math.PI * this.RBCRadius ** 2.0
+    member this.RBCMinArea = param.minimumCellArea * this.RBCArea
 
-    member this.ParasiteArea = param.infectionArea * Math.PI * this.RBCSize ** 2.0
-    member this.StainArea = param.stainArea * Math.PI * this.RBCSize ** 2.0
+    member this.InfectionArea = param.infectionArea * this.RBCArea
+    member this.StainArea = param.stainArea * this.RBCArea