X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FTypes.fs;h=5440115735887c0fe3a266241b5274557c5e3f9e;hp=ffe40b5af4479620a6532ddd440c22bf404a407c;hb=23466ba92c5595f6c0b9f97c86a221a4e5ffebe9;hpb=4bfa3cbdc6145e6944f02e24829ab2ef3a851ac1

diff --git a/Parasitemia/ParasitemiaCore/Types.fs b/Parasitemia/ParasitemiaCore/Types.fs
index ffe40b5..5440115 100644
--- a/Parasitemia/ParasitemiaCore/Types.fs
+++ b/Parasitemia/ParasitemiaCore/Types.fs
@@ -2,12 +2,15 @@
 
 open System
 open System.Drawing
+open System.Collections.Generic
 
 open Emgu.CV
 open Emgu.CV.Structure
 
 open Const
 
+type Points = HashSet<Point>
+
 type Ellipse (cx: float32, cy: float32, a: float32, b: float32, alpha: float32) =
     member this.Cx = cx
     member this.Cy = cy
@@ -16,7 +19,7 @@ type Ellipse (cx: float32, cy: float32, a: float32, b: float32, alpha: float32)
     member this.Alpha = alpha
     member this.Area = a * b * PI
 
-    // Does the ellipse contain the point (x, y)?.
+    // Does the ellipse contain the point (x, y)?
     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
 
@@ -32,7 +35,7 @@ type Ellipse (cx: float32, cy: float32, a: float32, b: float32, alpha: float32)
         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.
@@ -47,18 +50,54 @@ type CellClass = HealthyRBC | InfectedRBC | Peculiar
 type Cell = {
     cellClass: CellClass
     center: Point
-    infectedArea: int
-    stainArea: int
+    nucleusArea: int
+    parasiteArea: int
     elements: Matrix<byte> }
 
 [<Struct>]
 type Line (a: float32, b: float32) =
     member this.A = a
     member this.B = b
-    member this.Valid = not (Single.IsInfinity this.A)
 
-[<Struct>]
-type PointD (x: float32, y: float32) =
-    member this.X = x
-    member this.Y = y
+type MaybeBuilder () =
+    member this.Bind (x, f) =
+        match x with
+        | None -> None
+        | Some a -> f a
+
+    member this.ReturnFrom (x) = x
+
+    member this.TryFinally (body, compensation) =
+        try
+            this.ReturnFrom(body())
+        finally
+            compensation()
+
+    member this.Using (disposable: 'a when 'a :> IDisposable, body) =
+        let body' = fun () -> body disposable
+        this.TryFinally(body', fun () ->
+            match disposable with
+            | null -> ()
+            | disp -> disp.Dispose())
+
+    member this.Zero () =
+        None
+
+    member this.Return (x) =
+        Some x
+
+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