X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FTypes.fs;fp=Parasitemia%2FParasitemiaCore%2FTypes.fs;h=f88baf8bac5a5b8a289ec3ebe00b5cf5ac5231e6;hp=5440115735887c0fe3a266241b5274557c5e3f9e;hb=b87b35b922551f122228df1fd9c530bbb807935a;hpb=2e3cd07dd099944059ef5e7a7f5ef57ffe3d677b

diff --git a/Parasitemia/ParasitemiaCore/Types.fs b/Parasitemia/ParasitemiaCore/Types.fs
index 5440115..f88baf8 100644
--- a/Parasitemia/ParasitemiaCore/Types.fs
+++ b/Parasitemia/ParasitemiaCore/Types.fs
@@ -11,7 +11,7 @@ open Const
 
 type Points = HashSet<Point>
 
-type Ellipse (cx: float32, cy: float32, a: float32, b: float32, alpha: float32) =
+type Ellipse (cx : float32, cy : float32, a : float32, b : float32, alpha : float32) =
     member this.Cx = cx
     member this.Cy = cy
     member this.A = a
@@ -23,19 +23,19 @@ type Ellipse (cx: float32, cy: float32, a: float32, b: float32, alpha: float32)
     member this.Contains x y =
         ((x - cx) * cos alpha + (y - cy) * sin alpha) ** 2.f / a ** 2.f + ((x - cx) * sin alpha - (y - cy) * cos alpha) ** 2.f / b ** 2.f <= 1.f
 
-    member this.CutAVericalLine (y: float32) : bool =
+    member this.CutAVericalLine (y : float32) : bool =
         a ** 2.f + b ** 2.f - 2.f * y ** 2.f + 4.f * y * cx - 2.f * cx ** 2.f + a ** 2.f * cos (2.f * alpha) - b ** 2.f * cos (2.f * alpha) > 0.f
 
-    member this.CutAnHorizontalLine (x: float32) : bool =
+    member this.CutAnHorizontalLine (x : float32) : bool =
         a ** 2.f + b ** 2.f - 2.f * x ** 2.f + 4.f * x * cy - 2.f * cy ** 2.f - a ** 2.f * cos (2.f * alpha) + b ** 2.f * cos (2.f * alpha) > 0.f
 
-    member this.isOutside (width: float32) (height: float32) =
+    member this.isOutside (width : float32) (height : float32) =
         this.Cx < 0.f || this.Cx >= width ||
         this.Cy < 0.f || this.Cy >= height ||
         this.CutAVericalLine 0.f || this.CutAVericalLine width ||
         this.CutAnHorizontalLine 0.f || this.CutAnHorizontalLine height
 
-    member this.Scale (factor: float32) : Ellipse =
+    member this.Scale (factor : float32) : Ellipse =
         Ellipse(this.Cx, this.Cy, this.A * factor, this.B * factor, alpha)
 
     // Approximation of Ramanujan.
@@ -43,19 +43,21 @@ type Ellipse (cx: float32, cy: float32, a: float32, b: float32, alpha: float32)
         PI * (3.f * (this.A + this.B) - sqrt ((3.f * this.A + this.B) * (this.A + 3.f * this.B)))
 
     override this.ToString () =
-        sprintf "(cx: %A, cy: %A, a: %A, b: %A, alpha: %A)" this.Cx this.Cy this.A this.B this.Alpha
+        sprintf "(cx: %f, cy: %f, a: %f, b: %f, alpha: %f)" this.Cx this.Cy this.A this.B this.Alpha
 
 type CellClass = HealthyRBC | InfectedRBC | Peculiar
 
-type Cell = {
-    cellClass: CellClass
-    center: Point
-    nucleusArea: int
-    parasiteArea: int
-    elements: Matrix<byte> }
+type Cell =
+    {
+        cellClass : CellClass
+        center : Point
+        nucleusArea : int
+        parasiteArea : int
+        elements : Matrix<byte>
+    }
 
 [<Struct>]
-type Line (a: float32, b: float32) =
+type Line (a : float32, b : float32) =
     member this.A = a
     member this.B = b
 
@@ -73,7 +75,7 @@ type MaybeBuilder () =
         finally
             compensation()
 
-    member this.Using (disposable: 'a when 'a :> IDisposable, body) =
+    member this.Using (disposable : 'a when 'a :> IDisposable, body) =
         let body' = fun () -> body disposable
         this.TryFinally(body', fun () ->
             match disposable with