* Treat some special cases when ellipses intersecting.

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

diff --git a/Parasitemia/Parasitemia/Ellipse.fs b/Parasitemia/Parasitemia/Ellipse.fs
index 48c7f54..73771be 100644 (file)
--- a/Parasitemia/Parasitemia/Ellipse.fs
+++ b/Parasitemia/Parasitemia/Ellipse.fs
@@ -204,11 +204,11 @@ let private areVectorsValid (p1x: float) (p1y: float) (p2x: float) (p2y: float)
 
 
 let find (edges: Matrix<byte>)
-         (xDir: Image<Gray, float>)
-         (yDir: Image<Gray, float>)
+         (xGradient: Image<Gray, float>)
+         (yGradient: Image<Gray, float>)
          (config: Config) : MatchingEllipses =
 
-    let r1, r2 = config.Parameters.scale * config.RBCMinRadius, config.Parameters.scale * config.RBCMaxRadius // FIXME: scale factor should be applied in Config!?
+    let r1, r2 = config.RBCMinRadius, config.RBCMaxRadius
     let windowSize = roundInt (config.Parameters.factorWindowSize * r2)
     let factorNbPick = config.Parameters.factorNbPick
 
@@ -227,8 +227,8 @@ let find (edges: Matrix<byte>)
     let currentElements = List<(int * int)>()
 
     let edgesData = edges.Data
-    let xDirData = xDir.Data
-    let yDirData = yDir.Data
+    let xDirData = xGradient.Data
+    let yDirData = yGradient.Data
 
     let rng = Random(42)