X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FEllipse.fs;h=d0dea6e616ca8d364c27bb2bf26a56ab1027daa3;hp=174dd68548c0d17395f77d07dad47f04d8a8fbdf;hb=2d712781def419c9acc98368f7102b19b064f16d;hpb=d715615d0b1da40fd10e9dbabbd4530cd5125a19

diff --git a/Parasitemia/ParasitemiaCore/Ellipse.fs b/Parasitemia/ParasitemiaCore/Ellipse.fs
index 174dd68..d0dea6e 100644
--- a/Parasitemia/ParasitemiaCore/Ellipse.fs
+++ b/Parasitemia/ParasitemiaCore/Ellipse.fs
@@ -23,7 +23,7 @@ let minimumDistanceBetweenDrawnPoints = 0.6
 /// 'Ellipse.Alpha' is between 0 and Pi.
 /// </summary>
 let ellipse (p1x : float) (p1y : float) (m1 : float) (p2x : float) (p2y : float) (m2 : float) (p3x : float) (p3y : float) : Types.Ellipse option =
-    let p0 = pointFromTwoLines (Types.Line(float32 m1, float32 (p1y - m1 * p1x))) (Types.Line(float32 m2, float32(p2y - m2 * p2x)))
+    let p0 = pointFromTwoLines (Types.Line (float32 m1, float32 (p1y - m1 * p1x))) (Types.Line (float32 m2, float32(p2y - m2 * p2x)))
     let p0x, p0y = float p0.X, float p0.Y
 
     let s =
@@ -39,8 +39,8 @@ let ellipse (p1x : float) (p1y : float) (m1 : float) (p2x : float) (p2y : float)
     let v2 = matrix [[ 1.; p2x; p2y ]]
     let v3 = matrix [[ 1.; p3x; p3y ]]
 
-    let p = (v3.Stack(v1).Stack(v2).Determinant() * v0).Stack(v0.Stack(v3).Stack(v2).Determinant() * v1).Stack(v0.Stack(v1).Stack(v3).Determinant() * v2).Transpose()
-    let conicMat = p * s.Inverse() * p.Transpose()
+    let p = (v3.Stack(v1).Stack(v2).Determinant () * v0).Stack(v0.Stack(v3).Stack(v2).Determinant () * v1).Stack(v0.Stack(v1).Stack(v3).Determinant () * v2).Transpose ()
+    let conicMat = p * s.Inverse () * p.Transpose ()
     let a = conicMat.[0, 0]
     let b = conicMat.[0, 1]
     let c = conicMat.[1, 1]
@@ -57,7 +57,7 @@ let ellipse (p1x : float) (p1y : float) (m1 : float) (p2x : float) (p2y : float)
         None
     else
         let q = (-1. / at) * (matrix [[ a * f - d ** 2.0; b * d - a * e ]; [ b * d - a * e; a * c - b ** 2.0 ]])
-        let eigen = q.Evd()
+        let eigen = q.Evd ()
         let eigenValues = eigen.EigenValues
         let lambda = eigenValues.[1].Real
         let mu = eigenValues.[0].Real
@@ -77,7 +77,7 @@ let ellipse (p1x : float) (p1y : float) (m1 : float) (p2x : float) (p2y : float)
             let phi' = if phi < 0. then phi + Math.PI else phi
             let majorAxis, minorAxis = if r1 > r2 then r1, r2 else r2, r1
 
-            Some (Types.Ellipse(float32 cx, float32 cy, float32 majorAxis, float32 minorAxis, float32 phi'))
+            Some (Types.Ellipse (float32 cx, float32 cy, float32 majorAxis, float32 minorAxis, float32 phi'))
 
 let inline private vectorRotation (px : float32) (py : float32) (vx : float32) (vy : float32) (p0x : float32) (p0y : float32) : float32 =
     if py > p0y then
@@ -150,15 +150,15 @@ let find (edges : Matrix<byte>)
 
     let mutable last_i, last_j = Int32.MaxValue, Int32.MaxValue
 
-    let currentElements = List<Point>()
+    let currentElements = List<Point> ()
 
     let edgesData = edges.Data
     let xDirData = xGradient.Data
     let yDirData = yGradient.Data
 
-    let rng = Random(42)
+    let rng = Random 42
 
-    let ellipses = MatchingEllipses(config.RBCRadius.Pixel)
+    let ellipses = MatchingEllipses config.RBCRadius.Pixel
 
     for window_i in -windowSize + increment .. increment .. h - increment do
         for window_j in -windowSize + increment .. increment .. w - increment do
@@ -169,9 +169,9 @@ let find (edges : Matrix<byte>)
             let window_j_end = if window_j + windowSize - 1 >= w then w - 1 else window_j + windowSize - 1
 
             // Remove old elements.
-            let indexFirstElement = currentElements.FindIndex(fun p -> p.X >= window_j_begin)
+            let indexFirstElement = currentElements.FindIndex (fun p -> p.X >= window_j_begin)
             if indexFirstElement > 0 then
-                currentElements.RemoveRange(0, indexFirstElement)
+                currentElements.RemoveRange (0, indexFirstElement)
 
             // Add the new elements.
             let newElemsBegin_j = window_j + windowSize - increment
@@ -179,15 +179,15 @@ let find (edges : Matrix<byte>)
             for j = (if newElemsBegin_j < 0 then 0 else newElemsBegin_j) to (if newElemsEnd_j >= w then w - 1 else newElemsEnd_j) do
                 for i = window_i_begin to window_i_end do
                     if edgesData.[i, j] = 1uy then
-                        currentElements.Add(Point(j, i))
+                        currentElements.Add (Point (j, i))
 
             if currentElements.Count >= nbPickElementsMin then
                 let mutable nbOfPicks = (float currentElements.Count) * factorNbMaxPick |> int
                 let mutable nbOfValidPicks = (float currentElements.Count) * factorNbValidPick |> int
                 while nbOfPicks > 0 && nbOfValidPicks > 0 do
-                    let p1 = currentElements.[rng.Next(currentElements.Count)]
-                    let p2 = currentElements.[rng.Next(currentElements.Count)]
-                    let p3 = currentElements.[rng.Next(currentElements.Count)]
+                    let p1 = currentElements.[rng.Next currentElements.Count]
+                    let p2 = currentElements.[rng.Next currentElements.Count]
+                    let p3 = currentElements.[rng.Next currentElements.Count]
                     if p1 <> p2 && p1 <> p3 && p2 <> p3 then
                         nbOfPicks <- nbOfPicks - 1
                         let p1yf, p1xf = float p1.Y, float p1.X
@@ -207,7 +207,7 @@ let find (edges : Matrix<byte>)
                                 | _ -> ()
                             | _ -> ()
 
-        currentElements.Clear()
+        currentElements.Clear ()
 
     ellipses