X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FTypes.fs;h=634a7b71cae2ffb2a206a9fe205ec84adf14e69e;hb=84fdf7404133803fdf0dc867a4da68a144975191;hp=e93bbb0f9878799a715fd54676e2e2278196b4c4;hpb=e76da913cd58078ad2479357b2430ed62a6e0777;p=master-thesis.git

diff --git a/Parasitemia/Parasitemia/Types.fs b/Parasitemia/Parasitemia/Types.fs
index e93bbb0..634a7b7 100644
--- a/Parasitemia/Parasitemia/Types.fs
+++ b/Parasitemia/Parasitemia/Types.fs
@@ -18,12 +18,6 @@ type Ellipse (cx: float, cy: float, a: float, b: float, alpha: float) =
     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
 
-    // A line is defined as : y = mx + l
-    member this.CutALine (m: float) (l: float) : bool =
-        -2.0 * l ** 2.0 + a ** 2.0 + m ** 2.0 * a ** 2.0 + b ** 2.0 + m ** 2.0 * b ** 2.0 -
-        4.0 * m * l * cx - 2.0 * m ** 2.0 * cx ** 2.0 + 4.0 * l * cy + 4.0 * m * cx * cy -
-        2.0 * cy ** 2.0 + (-1.0 + m ** 2.0) * (a ** 2.0 - b ** 2.0) * cos (2.0 * alpha) - 2.0 * m * (a ** 2.0 - b ** 2.0) * sin (2.0 * alpha) > 0.0
-
     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
 
@@ -31,11 +25,21 @@ type Ellipse (cx: float, cy: float, a: float, b: float, alpha: float) =
         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.isOutside (width: float) (height: float) =
-        this.Cx <= 0.0 || this.Cx >= width ||
-        this.Cy <= 0.0 || this.Cy >= height ||
+        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.Scale (factor: float) =
+        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)))
+
+    override this.ToString () =
+        sprintf "(cx: %A, cy: %A, a: %A, b: %A, alpha: %A)" this.Cx this.Cy this.A this.B this.Alpha
+
 
 type CellClass = HealthyRBC | InfectedRBC | Peculiar
 
@@ -44,11 +48,12 @@ type Cell = {
     center: Point
     elements: Matrix<byte> }
 
-
+[<Struct>]
 type Line (a: float, b: float) =
     member this.A = a
     member this.B = b
 
+[<Struct>]
 type PointD (x: float, y: float) =
     member this.X = x
     member this.Y = y