From: Greg Burri Date: Mon, 21 Dec 2015 22:34:46 +0000 (+0100) Subject: Fix a bug in the ellipse overlap area computation. X-Git-Tag: 1.0.11~75 X-Git-Url: http://git.euphorik.ch/?a=commitdiff_plain;ds=inline;h=70c9b65e9034c14b5c63345cda3d5d579bbdc57c;p=master-thesis.git Fix a bug in the ellipse overlap area computation. --- diff --git a/Parasitemia/Parasitemia/EEOver.fs b/Parasitemia/Parasitemia/EEOver.fs index 1a6bb5f..ef21051 100644 --- a/Parasitemia/Parasitemia/EEOver.fs +++ b/Parasitemia/Parasitemia/EEOver.fs @@ -286,6 +286,7 @@ let private fourintpts (xint: float[]) (yint: float[]) (a1: float) (b1: float) ( if ellipse2tr xmid ymid aa bb cc dd ee ff < 0.0 then area2 <- 0.5 * (a1b1 * (theta.[1] - theta.[0]) - abs (xint.[0] * yint.[1] - xint.[1] * yint.[0])) + area3 <- 0.5 * (a1b1 * (theta.[3] - theta.[2]) - abs (xint.[2] * yint.[3] - xint.[3] * yint.[2])) area4 <- 0.5 * (a2b2 * (theta_tr.[2] - theta_tr.[1]) - abs (xint_tr.[1] * yint_tr.[2] - xint_tr.[2] * yint_tr.[1])) if theta_tr.[3] > theta_tr.[0]