X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FConfig.fs;h=b721b70a7ae8efb6f8f80be864d954a543155de7;hp=1110096ea4d826ec40277263f4a5cd59fcec8d52;hb=bb642da712542095d8c5ead2d0d036470eb040b9;hpb=3b645f8ff5259f88a33ffbd9a63b10a8640c439f

diff --git a/Parasitemia/ParasitemiaCore/Config.fs b/Parasitemia/ParasitemiaCore/Config.fs
index 1110096..b721b70 100644
--- a/Parasitemia/ParasitemiaCore/Config.fs
+++ b/Parasitemia/ParasitemiaCore/Config.fs
@@ -13,9 +13,6 @@ type Parameters = {
     rbcDiameter: float<μm>
     resolution: float<ppi>
 
-    colorContribution_BG_RBC: float * float * float // (R, G, B).
-    colorContribution_RBC_parasite: float * float * float // (R, G, B).
-
     ratioAreaPaleCenter: float32 // The area of the second opening is 'ratioSecondAreaOpen' * mean RBC area. It's applied only if greater than 'initialAreaOpen'.
 
     granulometryRange: float32 // The radius will be seeked from radius - granulometryRange * radius to radius + granulometryRange * radius.
@@ -24,60 +21,58 @@ type Parameters = {
     maxRbcRadius: float32 // Factor of the mean RBC radius.
 
     LPFStandardDeviationParasite: float<μm> // Sigma parameter of the gaussian to remove the high frequency noise.
-    LPFStandardDeviationStain: float<μm>
     LPFStandardDeviationRBC: float<μm>
 
     // Ellipse.
-    factorNbPick: float // The number of computed ellipse per edge pixel.
+    nbPickElementsMin: int
+    factorNbValidPick: float // The number of computed ellipse per edge pixel.
+    factorNbMaxPick: float
 
     // Parasites detection.
     darkStainLevel: float // Lower -> more sensitive. Careful about illumination on the borders.
     maxDarkStainRatio: float // When a cell must own less than this ratio to be a RBC.
 
     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.
+
     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.
     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. A cell with an area below this will be rejected.
-}
+    minimumCellAreaFactor: float32 } // Factor of the mean RBC area. A cell with an area below this will be rejected.
 
 let defaultParameters = {
-    rbcDiameter = 8.<μm>
-    resolution = 220.e3<ppi> // 220.e3<ppi> Correspond to 50X.
-
-    colorContribution_BG_RBC = (* 0., 1., 0. *) 0.16, 0.44, 0.4
-    colorContribution_RBC_parasite = (* 1., 0., 0. *) 0.54, 0.41, 0.05
+    rbcDiameter = 7.5<μm>
+    resolution = 230.e3<ppi> // 230.e3<ppi> Correspond to 50X.
 
     ratioAreaPaleCenter = 2.f / 5.f // The ratio between an RBC area and the area of the its pale center.
 
     granulometryRange = 0.5f
 
-    minRbcRadius = -0.3f
-    maxRbcRadius = 0.3f
+    minRbcRadius = -0.23f
+    maxRbcRadius = 0.23f
 
     LPFStandardDeviationParasite = 0.15<μm>
-    LPFStandardDeviationStain = 0.15<μm> // 0.12
-    LPFStandardDeviationRBC = 0.2<μm> // 8.5e-6<inch>. // 0.2<μm>
+    LPFStandardDeviationRBC = 0.22<μm>
 
-    factorNbPick = 1.0
+    nbPickElementsMin = 10
+    factorNbValidPick = 0.05 //1.0
+    factorNbMaxPick = 2.
 
-    darkStainLevel = 0.25 // 0.3
+    darkStainLevel = 0.25
     maxDarkStainRatio = 0.1 // 10 %
 
     parasiteRadiusRatio = 0.5f // 40 %
 
     minimumParasiteAreaRatio = 0.02f // 2 %
-    cytoplasmSensitivity = 0.96 //  1) 0.91, 2) 0.92
+    cytoplasmSensitivity = 0.96
 
     nucleusAreaRatio = 0.01f // 1.0 %
-    infectionSensitivity = 0.9 // 1) 0.93, 2) 0.94
+    infectionSensitivity = 0.92
 
-    standardDeviationMaxRatio = 0.5 // 0.5
+    standardDeviationMaxRatio = 0.6
     minimumCellAreaFactor = 0.4f }
 
 type RBCRadius (radius: float32, parameters: Parameters) =
@@ -124,10 +119,6 @@ type Config (param: Parameters) =
         let stdDeviation: float<px> = (μmToInch parameters.LPFStandardDeviationParasite) * parameters.resolution
         float stdDeviation
 
-    member this.LPFStandardDeviationStain =
-        let stdDeviation: float<px> = (μmToInch parameters.LPFStandardDeviationStain) * parameters.resolution
-        float stdDeviation
-
     member this.LPFStandardDeviationRBC =
         let stdDeviation: float<px> = (μmToInch parameters.LPFStandardDeviationRBC) * parameters.resolution
         float stdDeviation