X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FEllipse.fs;h=73771bee58873a88448b4ad471a3a6288f44d93f;hb=53440e757b4a4ab2a81b0f6a5dd1a2002c0133ba;hp=139b7b53302db542617078ad4fa7796dad09894e;hpb=b070295cf67b2025164a34b6594e84f0d771cdc9;p=master-thesis.git

diff --git a/Parasitemia/Parasitemia/Ellipse.fs b/Parasitemia/Parasitemia/Ellipse.fs
index 139b7b5..73771be 100644
--- 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
@@ -204,13 +204,13 @@ 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.scale * config.minRBCSize, config.scale * config.maxRBCSize
-    let windowSize = roundInt (config.factorWindowSize * r2)
-    let factorNbPick = config.factorNbPick
+    let r1, r2 = config.RBCMinRadius, config.RBCMaxRadius
+    let windowSize = roundInt (config.Parameters.factorWindowSize * r2)
+    let factorNbPick = config.Parameters.factorNbPick
 
     let increment = windowSize / 4
 
@@ -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)