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

diff --git a/Parasitemia/Parasitemia/Types.fs b/Parasitemia/Parasitemia/Types.fs
index e93bbb0..d7bacbd 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,8 +25,8 @@ 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
 
@@ -44,11 +38,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