Cleaning.

[master-thesis.git] / Parasitemia / Parasitemia / Config.fs

diff --git a/Parasitemia/Parasitemia/Config.fs b/Parasitemia/Parasitemia/Config.fs
index 55e142c..a1b06e2 100644 (file)
--- a/Parasitemia/Parasitemia/Config.fs
+++ b/Parasitemia/Parasitemia/Config.fs
@@ -26,7 +26,7 @@ type Parameters = {
 
     infectionArea: float // Factor of a RBC area. 0.5 means the half of RBC area.
     infectionLevel: float // [0, 1]
-    infectionPixelsRequired: int
+    parasitePixelsRequired: int
 
     maxDarkStainRatio: float
 
@@ -36,12 +36,12 @@ type Parameters = {
 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.RBCMinArea = param.minimumCellArea * Math.PI * this.RBCRadius ** 2.0
 
-    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 * Math.PI * this.RBCRadius ** 2.0
+    member this.StainArea = param.stainArea * Math.PI * this.RBCRadius ** 2.0