X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FTypes.fs;h=6240519d02f70fe904d9030c1c96a0d343facadb;hp=e27f7d0760dff6a765b15ce10c5b44358d8e84ee;hb=044b0ae69df3ac565432545b2fa934589016f9bd;hpb=6d99ab0dadc57e91cd846844b620fc90b52a2f96

diff --git a/Parasitemia/Parasitemia/Types.fs b/Parasitemia/Parasitemia/Types.fs
index e27f7d0..6240519 100644
--- a/Parasitemia/Parasitemia/Types.fs
+++ b/Parasitemia/Parasitemia/Types.fs
@@ -6,36 +6,38 @@ open System.Drawing
 open Emgu.CV
 open Emgu.CV.Structure
 
-type Ellipse (cx: float, cy: float, a: float, b: float, alpha: float) =
+open Const
+
+type Ellipse (cx: float32, cy: float32, a: float32, b: float32, alpha: float32) =
     member this.Cx = cx
     member this.Cy = cy
     member this.A = a
     member this.B = b
     member this.Alpha = alpha
-    member this.Area = a * b * Math.PI
+    member this.Area = a * b * PI
 
     // Does the ellipse contain the point (x, y)?.
     member this.Contains x y =
-        ((x - cx) * cos alpha + (y - cy) * sin alpha) ** 2.0 / a ** 2.0 + ((x - cx) * sin alpha - (y - cy) * cos alpha) ** 2.0 / b ** 2.0 <= 1.0
+        ((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: float) : bool =
-        a ** 2.0 + b ** 2.0 - 2.0 * y ** 2.0 + 4.0 * y * cx - 2.0 * cx ** 2.0 + a ** 2.0 * cos (2.0 * alpha) - b ** 2.0 * cos (2.0 * alpha) > 0.0
+    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: float) : bool =
-        a ** 2.0 + b ** 2.0 - 2.0 * x ** 2.0 + 4.0 * x * cy - 2.0 * cy ** 2.0 - a ** 2.0 * cos (2.0 * alpha) + b ** 2.0 * cos (2.0 * alpha) > 0.0
+    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: float) (height: float) =
-        this.Cx < 0.0 || this.Cx >= width ||
-        this.Cy < 0.0 || this.Cy >= height ||
-        this.CutAVericalLine 0.0 || this.CutAVericalLine width ||
-        this.CutAnHorizontalLine 0.0 || this.CutAnHorizontalLine height
+    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: float) =
+    member this.Scale (factor: float32) =
         Ellipse(this.Cx, this.Cy, this.A * factor, this.B * factor, alpha)
 
     // Approximation of Ramanujan.
     member this.Perimeter =
-        Math.PI * (3.0 * (this.A + this.B) - sqrt ((3.0 * this.A + this.B) * (this.A + 3.0 * this.B)))
+        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
@@ -49,13 +51,13 @@ type Cell = {
     elements: Matrix<byte> }
 
 [<Struct>]
-type Line (a: float, b: float) =
+type Line (a: float32, b: float32) =
     member this.A = a
     member this.B = b
-    member this.Valid = not (Double.IsInfinity this.A)
+    member this.Valid = not (Single.IsInfinity this.A)
 
 [<Struct>]
-type PointD (x: float, y: float) =
+type PointD (x: float32, y: float32) =
     member this.X = x
     member this.Y = y