X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FEllipse.fs;h=5bfcc333026a877bd637890d40c76037a1ce9966;hp=62273b579f25b7ce51eb08e9956fefa2a10a70c3;hb=dec96d50e56e1932bbfa09e6bedf90d6b707ccbd;hpb=ba64921fb9a0c36cd8cf802cbf1b2c0f79bc25f6

diff --git a/Parasitemia/Parasitemia/Ellipse.fs b/Parasitemia/Parasitemia/Ellipse.fs
index 62273b5..5bfcc33 100644
--- a/Parasitemia/Parasitemia/Ellipse.fs
+++ b/Parasitemia/Parasitemia/Ellipse.fs
@@ -31,20 +31,20 @@ let private goldenSectionSearch (f: float -> float) (nbIter: int) (xmin: float)
         
         if fc < fd
         then
-            b <- d;
-            d <- c;
-            c <- b - gr * (b - a);
+            b <- d
+            d <- c
+            c <- b - gr * (b - a)
         else
-            a <- c;
-            c <- d;
-            d <- a + gr * (b - a);
+            a <- c
+            c <- d
+            d <- a + gr * (b - a)
     
     let x = (b + a) / 2.0
     x, f x
 
 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 = 4;
-    let accuracy_extremum_search_2 = 3;
+    let accuracy_extremum_search_1 = 4
+    let accuracy_extremum_search_2 = 3
 
     // p3 as the referencial.
     let p1x = p1x - p3x
@@ -139,7 +139,7 @@ let ellipse (p1x: float) (p1y: float) (m1: float) (p2x: float) (p2y: float) (m2:
         let cx = cx + p3x
         let cy = cy + p3y
 
-        Some { cx = cx; cy = cy; a = r1e; b = r2e; alpha = alpha }
+        Some (Types.Ellipse(cx, cy, r1e, r2e, alpha))
     else
         None
 
@@ -195,13 +195,13 @@ let find (edges: Matrix<byte>)
          (windowSize: int) 
          (factorNbPick: float) : Types.Ellipse list =
 
-    let increment = windowSize / 4;
+    let increment = windowSize / 4
 
     let r1, r2 = radiusRange
     let radiusTolerance = (r2 - r1) * 0.2
 
-    let minimumDistance = (r2 / 1.5) ** 2.0;
-    let squaredDistance x1 y1 x2 y2 = (x1 - x2) ** 2.0 + (y1 - y2) ** 2.0;
+    let minimumDistance = (r2 / 1.5) ** 2.0
+    let squaredDistance x1 y1 x2 y2 = (x1 - x2) ** 2.0 + (y1 - y2) ** 2.0
 
     let h = edges.Height
     let w = edges.Width
@@ -214,9 +214,9 @@ let find (edges: Matrix<byte>)
     let xDirData = xDir.Data
     let yDirData = yDir.Data
 
-    let rng = Random()
+    let rng = Random(42)
     
-    let ellipses = MatchingEllipses ()
+    let ellipses = MatchingEllipses(r1)
         
     for window_i in -windowSize + increment .. increment .. h - increment do                                                  
         for window_j in -windowSize + increment .. increment .. w - increment do            
@@ -257,8 +257,8 @@ let find (edges: Matrix<byte>)
                             match areVectorsValid p1xf p1yf p2xf p2yf -xDirData.[p1y, p1x, 0] -yDirData.[p1y, p1x, 0] -xDirData.[p2y, p2x, 0] -yDirData.[p2y, p2x, 0] with
                             | Some (m1, m2) ->
                                 match ellipse p1xf p1yf m1 p2xf p2yf m2 p3xf p3yf with
-                                | Some e when e.cx > 0.0 && e.cx < (float w) - 1.0 && e.cy > 0.0 && e.cy < (float h) - 1.0 && 
-                                              e.a >= r1 - radiusTolerance && e.a <= r2 + radiusTolerance && e.b >= r1 - radiusTolerance && e.b <= r2 + radiusTolerance ->
+                                | Some e when e.Cx > 0.0 && e.Cx < (float w) - 1.0 && e.Cy > 0.0 && e.Cy < (float h) - 1.0 && 
+                                              e.A >= r1 - radiusTolerance && e.A <= r2 + radiusTolerance && e.B >= r1 - radiusTolerance && e.B <= r2 + radiusTolerance ->
                                      ellipses.Add e
                                 | _ -> ()
                             | _ -> ()