X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FTypes.fs;h=c1a635d9b659b2ce24dac06ad2ab35d95d109562;hb=aeb0583fa94d4c8cef1f8b53559ecac76bc1a191;hp=e2accb7b98da738690a38085078fde075c846878;hpb=6c70577f0bcc17881c753f7a527d2ff4672bb6aa;p=master-thesis.git

diff --git a/Parasitemia/ParasitemiaCore/Types.fs b/Parasitemia/ParasitemiaCore/Types.fs
index e2accb7..c1a635d 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) =
+    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
-    infectedArea: int
-    stainArea: 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
 
@@ -65,13 +67,15 @@ type MaybeBuilder () =
         | None -> None
         | Some a -> f a
 
-    member this.ReturnFrom (x) = x
+    member this.ReturnFrom x = x
 
     member this.TryFinally (body, compensation) =
-        try this.ReturnFrom(body())
-        finally compensation()
+        try
+            this.ReturnFrom(body())
+        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
@@ -81,7 +85,21 @@ type MaybeBuilder () =
     member this.Zero () =
         None
 
-    member this.Return (x) =
+    member this.Return x =
         Some x
 
-let maybe = new MaybeBuilder()
\ No newline at end of file
+let maybe = MaybeBuilder()
+
+type Result<'a> =
+    | Success of 'a
+    | Fail of string // Error message.
+
+type ResultBuilder () =
+    member this.Bind (res, f) =
+        match res with
+        | Success value -> f value
+        | fail -> fail
+
+    member this.ReturnFrom (x) = x
+
+let result = ResultBuilder()
\ No newline at end of file