X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FClassifier.fs;h=f0c9d01e4f6ce399df9ed3cde1815e5b8f6afd05;hp=0d2137545334091fc551d17610ff5f6f69d49243;hb=044b0ae69df3ac565432545b2fa934589016f9bd;hpb=53440e757b4a4ab2a81b0f6a5dd1a2002c0133ba

diff --git a/Parasitemia/Parasitemia/Classifier.fs b/Parasitemia/Parasitemia/Classifier.fs
index 0d21375..f0c9d01 100644
--- a/Parasitemia/Parasitemia/Classifier.fs
+++ b/Parasitemia/Parasitemia/Classifier.fs
@@ -37,13 +37,13 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (img:
         // The minimum window to contain a given ellipse.
         let ellipseWindow (e: Ellipse) =
             let cx, cy = roundInt e.Cx, roundInt e.Cy
-            let a = int (e.A + 0.5)
+            let a = int (e.A + 0.5f)
             cx - a, cy - a, cx + a, cy + a
 
         let w = img.Width
-        let w_f = float w
+        let w_f = float32 w
         let h = img.Height
-        let h_f = float h
+        let h_f = float32 h
 
         // Return 'true' if the point 'p' is owned by e.
         // The lines represents all intersections with other ellipses.
@@ -79,13 +79,17 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (img:
                 tree.Search (searchRegion e)
                     // We only keep the ellipses touching 'e'.
                     |> List.choose (fun otherE ->
-                        match EEOver.EEOverlapArea e otherE with
-                        | Some (_, px, _) when px.Length > 2 ->
-                            otherE.Removed <- true
-                            None
-                        | Some (area, px, py) when area > 0.0 && px.Length = 2 ->
-                            Some (otherE, PointD(px.[0], py.[0]), PointD(px.[1], py.[1]))
-                        | _ ->
+                        if e <> otherE
+                        then
+                            match EEOver.EEOverlapArea e otherE with
+                            | Some (_, px, _) when px.Length > 2 ->
+                                otherE.Removed <- true
+                                None
+                            | Some (area, px, py) when area > 0.f && px.Length = 2 ->
+                                Some (otherE, PointD(px.[0], py.[0]), PointD(px.[1], py.[1]))
+                            | _ ->
+                                None
+                        else
                             None )
             else
                 []
@@ -101,24 +105,24 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (img:
         // 3) Remove ellipses with a high standard deviation (high contrast).
 
         // CvInvoke.Normalize(img, img, 0.0, 255.0, CvEnum.NormType.MinMax) // Not needed.
-
+        let imgData = img.Data
         let globalStdDeviation = MathNet.Numerics.Statistics.Statistics.StandardDeviation(seq {
             for y in 0 .. h - 1 do
                 for x in 0 .. w - 1 do
-                    yield float img.Data.[y, x, 0] })
+                    yield float imgData.[y, x, 0] })
 
         for e in ellipses do
             if not e.Removed
             then
-                let shrinkedE = e.Scale 0.9
+                let shrinkedE = e.Scale 0.9f
                 let minX, minY, maxX, maxY = ellipseWindow shrinkedE
 
                 let stdDeviation = MathNet.Numerics.Statistics.Statistics.StandardDeviation (seq {
                     for y in (if minY < 0 then 0 else minY) .. (if maxY >= h then h - 1 else maxY) do
                         for x in (if minX < 0 then 0 else minX) .. (if maxX >= w then w - 1 else maxX) do
-                            if shrinkedE.Contains (float x) (float y)
+                            if shrinkedE.Contains (float32 x) (float32 y)
                             then
-                                yield float img.Data.[y, x, 0] })
+                                yield float imgData.[y, x, 0] })
 
                 if stdDeviation > globalStdDeviation * config.Parameters.standardDeviationMaxRatio then
                     e.Removed <- true
@@ -133,7 +137,7 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (img:
                 let mutable area = 0
                 for y in (if minY < 0 then 0 else minY) .. (if maxY >= h then h - 1 else maxY) do
                     for x in (if minX < 0 then 0 else minX) .. (if maxX >= w then w - 1 else maxX) do
-                        let p = PointD(float x, float y)
+                        let p = PointD(float32 x, float32 y)
                         if pixelOwnedByE p e (neighbors |> List.choose (fun (otherE, p1, p2) -> if otherE.Removed then None else Some (otherE :> Ellipse, Utils.lineFromTwoPoints p1 p2)))
                         then
                             area <- area + 1
@@ -159,7 +163,7 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (img:
                 let elements = new Matrix<byte>(maxY - minY + 1, maxX - minX + 1)
                 for y in minY .. maxY do
                     for x in minX .. maxX do
-                        let p = PointD(float x, float y)
+                        let p = PointD(float32 x, float32 y)
                         if pixelOwnedByE p e (neighbors |> List.choose (fun (otherE, p1, p2) -> if otherE.Removed then None else Some (otherE :> Ellipse, Utils.lineFromTwoPoints p1 p2)))
                         then
                             elements.[y-minY, x-minX] <- 1uy
@@ -179,8 +183,7 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (img:
 
                 let cellClass =
                     if float darkStainPixels > config.Parameters.maxDarkStainRatio * (float nbElement) ||
-                       float stainPixels > config.Parameters.maxStainRatio * (float nbElement) (* ||
-                        sqrt (((float sumCoords_x) / (float nbElement) - e.Cx) ** 2.0 + ((float sumCoords_y) / (float nbElement) - e.Cy) ** 2.0) > e.A * config.maxOffcenter *)
+                       float stainPixels > config.Parameters.maxStainRatio * (float nbElement)
                     then
                         Peculiar
                     elif infectedPixels.Count >= 1