X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FClassifier.fs;h=2b6f3bee0ab729f6c401ffceca5f58c7b260c0ef;hb=828e126c88524d3dc123abc966a132532aed118b;hp=a3bfa9c92aa3f139776f08282296dde26ce5d1eb;hpb=db49e167a602ef1df02a8b5f7de334355a4917dd;p=master-thesis.git

diff --git a/Parasitemia/ParasitemiaCore/Classifier.fs b/Parasitemia/ParasitemiaCore/Classifier.fs
index a3bfa9c..2b6f3be 100644
--- a/Parasitemia/ParasitemiaCore/Classifier.fs
+++ b/Parasitemia/ParasitemiaCore/Classifier.fs
@@ -24,7 +24,7 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (img:
     then
         []
     else
-        let infection = parasites.infection.Copy() // To avoid to modify the parameter.
+        let infection = parasites.nucleus.Copy() // To avoid to modify the parameter.
 
         // This is the minimum window size to check if other ellipses touch 'e'.
         let searchRegion (e: Ellipse) = { KdTree.minX = e.Cx - (e.A + config.RBCRadius.Max)
@@ -148,12 +148,8 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (img:
                     e.Removed <- true
 
         // 5) Define pixels associated to each ellipse and create the cells.
-        let radiusParasiteRatio = 0.4f
-        let radiusParasite = config.RBCRadius.Pixel * 0.5f
-        let perimeterParasiteSquared = (2.f * radiusParasite) ** 2.f |> roundInt
-        let parasiteOccupation = 0.08f // 8 %
-        let minimumParasiteArea = Const.PI * radiusParasite ** 2.f * parasiteOccupation |> roundInt
-        //let minimumStainArea = roundInt <| config.RBCRadius.Area * 0.02f // 1.5 %
+        let perimeterParasiteSquared = (2.f * config.RBCRadius.ParasiteRadius) ** 2.f |> roundInt
+        let minimumParasiteArea = config.RBCRadius.MinimumParasiteArea |> roundInt
         ellipsesWithNeigbors
         |> List.choose (fun (e, neighbors) ->
             if e.Removed
@@ -163,7 +159,7 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (img:
                 let minX, minY, maxX, maxY = ellipseWindow e
 
                 let infectedPixels = List<Point>()
-                let stainPixels = List<Point>()
+                let cytoplasmPixels = List<Point>()
 
                 //let mutable stainPixels = 0
                 let mutable darkStainPixels = 0
@@ -179,7 +175,7 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (img:
                             nbElement <- nbElement + 1
 
                             let infected = infection.Data.[y, x, 0] > 0uy
-                            let stain = parasites.stain.Data.[y, x, 0] > 0uy
+                            let stain = parasites.cytoplasm.Data.[y, x, 0] > 0uy
                             let darkStain = parasites.darkStain.Data.[y, x, 0] > 0uy
 
                             if infected
@@ -188,19 +184,19 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (img:
 
                             if stain
                             then
-                                stainPixels.Add(Point(x, y))
+                                cytoplasmPixels.Add(Point(x, y))
 
                             if darkStain
                             then
                                 darkStainPixels <- darkStainPixels + 1
 
-                let mutable stainArea = 0
+                let mutable cytoplasmArea = 0
                 if infectedPixels.Count > 0
                 then
-                    for stainPixel in stainPixels do
-                        if infectedPixels.Exists(fun p -> pown (p.X - stainPixel.X) 2 + pown (p.Y - stainPixel.Y) 2 <= perimeterParasiteSquared)
+                    for cytoplasmPixel in cytoplasmPixels do
+                        if infectedPixels.Exists(fun p -> pown (p.X - cytoplasmPixel.X) 2 + pown (p.Y - cytoplasmPixel.Y) 2 <= perimeterParasiteSquared)
                         then
-                            stainArea <- stainArea + 1
+                            cytoplasmArea <- cytoplasmArea + 1
 
 
                 let cellClass =
@@ -209,9 +205,9 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (img:
                     then
                         Peculiar
 
-                    elif infectedPixels.Count > 0 && stainArea >= minimumParasiteArea
+                    elif infectedPixels.Count > 0 && cytoplasmArea >= minimumParasiteArea
                     then
-                        let infectionToRemove = ImgTools.connectedComponents parasites.stain infectedPixels
+                        let infectionToRemove = ImgTools.connectedComponents parasites.cytoplasm infectedPixels
                         for p in infectionToRemove do
                             infection.Data.[p.Y, p.X, 0] <- 0uy
                         InfectedRBC
@@ -221,6 +217,6 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (img:
 
                 Some { cellClass = cellClass
                        center = Point(roundInt e.Cx, roundInt e.Cy)
-                       infectedArea = if cellClass = InfectedRBC then infectedPixels.Count else 0
-                       stainArea = stainArea
+                       nucleusArea = if cellClass = InfectedRBC then infectedPixels.Count else 0
+                       parasiteArea = cytoplasmArea
                        elements = elements })