X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FClassifier.fs;h=8467d24e7f212c920b700937bf82050cafcdea7e;hp=37507c5e927c1b685c5bd3a541afd4ec57821608;hb=8cf3b0a302943312c588690b4e4c90af17b3e87a;hpb=e76da913cd58078ad2479357b2430ed62a6e0777

diff --git a/Parasitemia/Parasitemia/Classifier.fs b/Parasitemia/Parasitemia/Classifier.fs
index 37507c5..8467d24 100644
--- a/Parasitemia/Parasitemia/Classifier.fs
+++ b/Parasitemia/Parasitemia/Classifier.fs
@@ -41,8 +41,9 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (fg:
             cx - a, cy - a, cx + a, cy + a
 
         // 1) Remove ellipses touching the edges.
-        let ellipsesInside = ellipses |> List.map (fun e ->
-            EllipseFlaggedKd (e, Removed = e.isOutside (float fg.Width) (float fg.Height)))
+        let w = float fg.Width
+        let h = float fg.Height
+        let ellipsesInside = ellipses |> List.map (fun e -> EllipseFlaggedKd (e, Removed = e.isOutside w h))
 
         // 2) Associate touching ellipses with each ellipses.
         let tree = KdTree.Tree.BuildTree ellipsesInside
@@ -58,29 +59,47 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (fg:
 
         let ellipsesWithNeigbors = ellipsesInside |> List.choose (fun e -> if e.Removed then None else Some (e, neighbors e))
 
-        // 3) Remove ellipse with a lower percentage of foreground.
-        let fgData = fg.Data
+        // 3) Remove ellipses with a lower percentage of foreground.
         for e, neighbors in ellipsesWithNeigbors do
             let minX, minY, maxX, maxY = ellipseWindow e
 
             let mutable totalElement = 0
             let mutable fgElement = 0
-
-            for y in minY .. maxY do
-                for x in minX .. maxX do
+            for y in (if minY < 0 then 0 else minY) .. (if maxY >= fg.Height then fg.Height - 1 else maxY) do
+                for x in (if minX < 0 then 0 else minX) .. (if maxX >= fg.Width then fg.Width - 1 else maxX) do
                     let yf, xf = float y, float x
                     if e.Contains xf yf && neighbors |> List.forall (fun (otherE, _, _) -> not <| otherE.Contains xf yf)
-                    then
-                        totalElement <- totalElement + 1
-                        if fgData.[y, x, 0] > 0uy
                         then
-                            fgElement <- fgElement + 1
+                            totalElement <- totalElement + 1
+                            if fg.Data.[y, x, 0] > 0uy
+                            then
+                                fgElement <- fgElement + 1
 
-            if totalElement < config.minimumCellArea || (float fgElement) / (float totalElement) < config.percentageOfFgValidCell
+            if (float fgElement) / (float totalElement) < config.percentageOfFgValidCell
             then
                 e.Removed <- true
 
-        // 3) Define pixels associated to each ellipse and create the cells.
+        // 4) Remove ellipses with little area.
+        for e, neighbors in ellipsesWithNeigbors do
+            if not e.Removed
+            then
+                let minX, minY, maxX, maxY = ellipseWindow e
+
+                let mutable area = 0
+                for y in (if minY < 0 then 0 else minY) .. (if maxY >= fg.Height then fg.Height - 1 else maxY) do
+                    for x in (if minX < 0 then 0 else minX) .. (if maxX >= fg.Width then fg.Width - 1 else maxX) do
+                        let yf, xf = float y, float x
+                        if fg.Data.[y, x, 0] > 0uy &&
+                           e.Contains xf yf &&
+                           neighbors |> List.forall (fun (otherE, _, _) -> otherE.Removed || not <| otherE.Contains xf yf)
+                            then
+                                area <- area + 1
+
+                if area < config.minimumCellArea
+                then
+                    e.Removed <- true
+
+        // 5) Define pixels associated to each ellipse and create the cells.
 
         // Return 'true' if the point 'p' is owned by e.
         // The lines represents all intersections with other ellipses.
@@ -94,7 +113,6 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (fg:
                     yield sign (c.X - p.X) <> sign (c.X - p'.X) || Utils.squaredDistanceTwoPoints c p' > Utils.squaredDistanceTwoPoints c p // 'false' -> the point is owned by another ellipse.
             } |> Seq.forall id
 
-
         ellipsesWithNeigbors
         |> List.choose (fun (e, neighbors) ->
             if e.Removed