X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FEEOver.fs;h=52b59636eeadbe631cc74dcb44b706254e56deab;hp=640d7525a2083aa559e4bdc40bd8883287d860a2;hb=e76da913cd58078ad2479357b2430ed62a6e0777;hpb=d9a6e072ecf299db691c05bb559a71265f812ba3 diff --git a/Parasitemia/Parasitemia/EEOver.fs b/Parasitemia/Parasitemia/EEOver.fs index 640d752..52b5963 100644 --- a/Parasitemia/Parasitemia/EEOver.fs +++ b/Parasitemia/Parasitemia/EEOver.fs @@ -718,4 +718,10 @@ let EEOverlapArea (e1: Types.Ellipse) (e2: Types.Ellipse) : (float * float[] * f | _ -> -1.0 if nintpts = 0 then Some (area, [||], [||]) - else Some (area, xint.[..nintpts-1], yint.[..nintpts-1]) \ No newline at end of file + else + let xTransform = Array.zeroCreate nintpts + let yTransform = Array.zeroCreate nintpts + for i in 0 .. (nintpts - 1) do + xTransform.[i] <- cos phi_1 * xint.[i] - sin phi_1 * yint.[i] + h1 + yTransform.[i] <- sin phi_1 * xint.[i] + cos phi_1 * yint.[i] + k1 + Some (area, xTransform, yTransform) \ No newline at end of file