X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FTypes.fs;h=32f2f8f0f8b380ba1e760b240664961ff9b190cd;hp=0cb27689bc1b716bbd57bb1450dbc8c670406db4;hb=a498bc4223a22cd38b91b3348912301e15c077ae;hpb=42d4db26f30bccbcc2e1b6d1f82a5b04a1f3dcd2

diff --git a/Parasitemia/ParasitemiaCore/Types.fs b/Parasitemia/ParasitemiaCore/Types.fs
index 0cb2768..32f2f8f 100644
--- a/Parasitemia/ParasitemiaCore/Types.fs
+++ b/Parasitemia/ParasitemiaCore/Types.fs
@@ -44,8 +44,21 @@ type Ellipse (cx : float32, cy : float32, a : float32, b : float32, alpha : floa
         PI * (3.f * (this.A + this.B) - sqrt ((3.f * this.A + this.B) * (this.A + 3.f * this.B)))
 
     override this.ToString () =
-        sprintf "{Ellipse: cx = %f, cy = %f, a = %f, b = %f, alpha = %f}" this.Cx this.Cy this.A this.B this.Alpha
+        $"{{{nameof Ellipse}: {nameof this.Cx} = %f{this.Cx}, {nameof this.Cy} = %f{this.Cy}, {nameof this.A} = %f{this.A}, {nameof this.B} = %f{this.B}, {nameof this.Alpha} = %f{this.Alpha}}}"
 
+    override this.Equals (other : obj) =
+        match other with
+        | :? Ellipse as otherEllipse ->
+            otherEllipse.Cx = this.Cx &&
+            otherEllipse.Cy = this.Cy &&
+            otherEllipse.A = this.A &&
+            otherEllipse.B = this.B &&
+            otherEllipse.Alpha = this.Alpha
+        | _ -> false
+
+    override this.GetHashCode () = HashCode.Combine (this.Cx, this.Cy, this.A, this.B, this.Alpha)
+
+[<Struct>]
 type CellClass = HealthyRBC | InfectedRBC | Peculiar
 
 type Cell =
@@ -105,7 +118,7 @@ type ResultBuilder () =
 
 let result = ResultBuilder ()
 
-type AnalysisResult = 
+type AnalysisResult =
     {
         Cells : Cell list
         RBCSize_μm : float<μm>