X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FEEOver.fs;h=422e86ff2b633c76a9b49426b7baa3cfe8cc8504;hp=a7791c90d6067af311ae3ec608f430b1913bc934;hb=2d712781def419c9acc98368f7102b19b064f16d;hpb=b87b35b922551f122228df1fd9c530bbb807935a

diff --git a/Parasitemia/ParasitemiaCore/EEOver.fs b/Parasitemia/ParasitemiaCore/EEOver.fs
index a7791c9..422e86f 100644
--- a/Parasitemia/ParasitemiaCore/EEOver.fs
+++ b/Parasitemia/ParasitemiaCore/EEOver.fs
@@ -356,7 +356,7 @@ let private cubicroots (p : float[]) (r : float[,]) =
             else
                 b <- d
             c <- t / b
-        d <- sqrt(0.75) * (b - c)
+        d <- sqrt 0.75 * (b - c)
         r.[2, 2] <- d
         b <- b + c
         c <- -0.5 * b - s
@@ -404,7 +404,7 @@ let private cubicroots (p : float[]) (r : float[,]) =
         for k = 1 to 3 do
             r.[2, k] <- 0.0
 
-let private biquadroots (p : float[]) (r : float[,]) =
+let inline private biquadroots (p : float[]) (r : float[,]) =
     if p.[0] <> 1.0 then
         for k = 1 to 4 do
             p.[k] <- p.[k] / p.[0]
@@ -609,8 +609,8 @@ let EEOverlapArea (e1 : Types.Ellipse) (e2 : Types.Ellipse) : (float32 * float32
                 let x2 = -x1
 
 #if DEBUG_LOG
-                printf "\n\tx1=%f, y1=%f, A=%f. B=%f ---> ellipse2tr(x1)= %f\n" x1 ychk.[i] a1 b1 (ellipse2tr x1 ychk.[i] aa bb cc dd ee ff)
-                printf "\tx2=%f, y1=%f, A=%f. B=%f ---> ellipse2tr(x2)= %f\n" x2 ychk.[i] a1 b1 (ellipse2tr x2 ychk.[i] aa bb cc dd ee ff)
+                printf "\n\tx1=%f, y1=%f, A=%f. B=%f ---> ellipse2tr (x1)= %f\n" x1 ychk.[i] a1 b1 (ellipse2tr x1 ychk.[i] aa bb cc dd ee ff)
+                printf "\tx2=%f, y1=%f, A=%f. B=%f ---> ellipse2tr (x2)= %f\n" x2 ychk.[i] a1 b1 (ellipse2tr x2 ychk.[i] aa bb cc dd ee ff)
 #endif
 
                 if abs (ellipse2tr x1 ychk.[i] aa bb cc dd ee ff) < EPS then