Change the parasite detection method.

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

diff --git a/Parasitemia/Parasitemia/Ellipse.fs b/Parasitemia/Parasitemia/Ellipse.fs
index 139b7b5..33333bf 100644 (file)
--- a/Parasitemia/Parasitemia/Ellipse.fs
+++ b/Parasitemia/Parasitemia/Ellipse.fs
@@ -46,8 +46,8 @@ let private goldenSectionSearch (f: float -> float) (nbIter: int) (xmin: float)
 // Ellipse.A is always equal or greater than Ellipse.B.
 // Ellipse.Alpha is between 0 and Pi.
 let ellipse (p1x: float) (p1y: float) (m1: float) (p2x: float) (p2y: float) (m2: float) (p3x: float) (p3y: float) : Types.Ellipse option =
-    let accuracy_extremum_search_1 = 7 // 3
-    let accuracy_extremum_search_2 = 7 // 4
+    let accuracy_extremum_search_1 = 8 // 3
+    let accuracy_extremum_search_2 = 8 // 4
 
     // p3 as the referencial.
     let p1x = p1x - p3x
@@ -208,9 +208,9 @@ let find (edges: Matrix<byte>)
          (yDir: Image<Gray, float>)
          (config: Config) : MatchingEllipses =
 
-    let r1, r2 = config.scale * config.minRBCSize, config.scale * config.maxRBCSize
-    let windowSize = roundInt (config.factorWindowSize * r2)
-    let factorNbPick = config.factorNbPick
+    let r1, r2 = config.Parameters.scale * config.RBCMin, config.Parameters.scale * config.RBCMax // FIXME: scale factor should be applied in Config!?
+    let windowSize = roundInt (config.Parameters.factorWindowSize * r2)
+    let factorNbPick = config.Parameters.factorNbPick
 
     let increment = windowSize / 4