X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;ds=sidebyside;f=Parasitemia%2FParasitemiaCore%2FConfig.fs;h=21a36f98152cbbc0393f6e54d84ddb7dd421c0e7;hb=000e7091983f20ef75d0eba9bf1c865c76483f24;hp=67b9ce3df31bcbd23bbc1d0e1ac3546c524ccc82;hpb=9a025e7d947ffbe097eb844f3214fbc95e134f7c;p=master-thesis.git

diff --git a/Parasitemia/ParasitemiaCore/Config.fs b/Parasitemia/ParasitemiaCore/Config.fs
index 67b9ce3..21a36f9 100644
--- a/Parasitemia/ParasitemiaCore/Config.fs
+++ b/Parasitemia/ParasitemiaCore/Config.fs
@@ -35,6 +35,7 @@ type Parameters = {
     parasiteRadiusRatio: float32 // The ratio of the parasite radius of the RBC radius.
     minimumParasiteAreaRatio: float32 // Factor of a RBC area. 0.5 means the half of RBC area.
 
+    cytoplasmSizeRatio: float32
     cytoplasmSensitivity: float // between 0 (the least sensitive) and 1 (the most sensitive).
 
     nucleusAreaRatio: float32 // Factor of a RBC area. 0.5 means the half of RBC area.
@@ -59,14 +60,15 @@ let defaultParameters = {
 
     nbPickElementsMin = 10
     factorNbValidPick = 0.06 //1.0
-    factorNbMaxPick = 2.
+    factorNbMaxPick = 4.
 
-    darkStainLevel = 0.25
+    darkStainLevel = 1.1
     maxDarkStainRatio = 0.1 // 10 %
 
-    parasiteRadiusRatio = 0.5f // 40 %
-
+    parasiteRadiusRatio = 0.5f // 50 %
     minimumParasiteAreaRatio = 0.02f // 2 %
+
+    cytoplasmSizeRatio = 1.f / 5.f
     cytoplasmSensitivity = 0.96
 
     nucleusAreaRatio = 0.01f // 1.0 %
@@ -87,6 +89,7 @@ type RBCRadius (radius: float32, parameters: Parameters) =
     member this.MinArea = parameters.minimumCellAreaFactor * this.Area
 
     member this.ParasiteRadius = parameters.parasiteRadiusRatio * radius
+    member this.CytoplasmSize = parameters.cytoplasmSizeRatio * radius
 
     member this.NucleusArea = parameters.nucleusAreaRatio * this.Area
     member this.MinimumParasiteArea = parameters.minimumParasiteAreaRatio * this.Area