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

diff --git a/Parasitemia/ParasitemiaCore/Types.fs b/Parasitemia/ParasitemiaCore/Types.fs
index e2accb7..5440115 100644
--- a/Parasitemia/ParasitemiaCore/Types.fs
+++ b/Parasitemia/ParasitemiaCore/Types.fs
@@ -35,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.
@@ -50,8 +50,8 @@ type CellClass = HealthyRBC | InfectedRBC | Peculiar
 type Cell = {
     cellClass: CellClass
     center: Point
-    infectedArea: int
-    stainArea: int
+    nucleusArea: int
+    parasiteArea: int
     elements: Matrix<byte> }
 
 [<Struct>]
@@ -68,8 +68,10 @@ type MaybeBuilder () =
     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) =
         let body' = fun () -> body disposable
@@ -84,4 +86,18 @@ type MaybeBuilder () =
     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