X-Git-Url: http://git.euphorik.ch/index.cgi?a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FConfig.fs;h=45b1ca3e303e3846b170b02f70143d712c6fc91a;hb=f9ee9f2c0c1194a6a8f7475ee2ca0b7076b32261;hp=261d87bb7fb67cd419c47857eeecdb2c33d265b8;hpb=21ce317bce2e1b58803bbb1be439161251478568;p=master-thesis.git

diff --git a/Parasitemia/Parasitemia/Config.fs b/Parasitemia/Parasitemia/Config.fs
index 261d87b..45b1ca3 100644
--- a/Parasitemia/Parasitemia/Config.fs
+++ b/Parasitemia/Parasitemia/Config.fs
@@ -20,15 +20,14 @@ 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]
-    parasitePixelsRequired: int
-
-    maxDarkStainRatio: float
+    infectionLevel: float // > 1
 
     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 RBC area.
@@ -42,7 +41,8 @@ type Config (param: Parameters) =
     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.RBCRadius ** 2.0
+    member this.RBCArea = Math.PI * this.RBCRadius ** 2.0
+    member this.RBCMinArea = param.minimumCellArea * this.RBCArea
 
-    member this.InfectionArea = param.infectionArea * Math.PI * this.RBCRadius ** 2.0
-    member this.StainArea = param.stainArea * Math.PI * this.RBCRadius ** 2.0
+    member this.InfectionArea = param.infectionArea * this.RBCArea
+    member this.StainArea = param.stainArea * this.RBCArea