X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FMainAnalysis.fs;h=53429b234dd8589ea3423d149e0ed17cb386deaa;hp=8f595141c638a57ca6dd727a18bb9b1d2c282fe7;hb=81d1b86719a1ebaf649c1de4c1364603155a53e1;hpb=aaa250fab2ac3227bf45704355d389bc1a4ee7fc

diff --git a/Parasitemia/Parasitemia/MainAnalysis.fs b/Parasitemia/Parasitemia/MainAnalysis.fs
index 8f59514..53429b2 100644
--- a/Parasitemia/Parasitemia/MainAnalysis.fs
+++ b/Parasitemia/Parasitemia/MainAnalysis.fs
@@ -36,18 +36,17 @@ let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) (reportPr
     let initialAreaOpening = int <| config.RBCRadiusByResolution.Area * config.Parameters.ratioAreaPaleCenter * 1.2f // We do an area opening a little larger to avoid to do a second one in the case the radius found is near the initial one.
     logTimeWithName "Area opening number one" (fun () -> ImgTools.areaOpenF filteredGreen initialAreaOpening)
 
-    report 8
+    report 10
 
     let range =
         let delta = config.Parameters.granulometryRange * config.RBCRadiusByResolution.Pixel
         int <| config.RBCRadiusByResolution.Pixel - delta, int <| config.RBCRadiusByResolution.Pixel + delta
     //let r1 = log "Granulometry (morpho)" (fun() -> Granulometry.findRadiusByClosing (filteredGreen.Convert<Gray, byte>()) range 1.0 |> float32)
     config.SetRBCRadius <| logTimeWithName "Granulometry (area)" (fun() -> Granulometry.findRadiusByAreaClosing filteredGreen range |> float32)
-    // log (sprintf "r1: %A, r2: %A" r1 r2)
 
     logWithName (sprintf "Found erytrocyte diameter: %A" config.RBCRadius)
 
-    report 24
+    report 20
 
     let secondAreaOpening = int <| config.RBCRadius.Area * config.Parameters.ratioAreaPaleCenter
     if secondAreaOpening > initialAreaOpening
@@ -62,13 +61,15 @@ let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) (reportPr
         removeArea edges (config.RBCRadius.Pixel ** 2.f / 50.f |> int)
         edges, xGradient, yGradient)
 
-    let allEllipses, ellipses = logTimeWithName "Finding ellipses" (fun () ->
-        let matchingEllipses = Ellipse.find edges xGradient yGradient config
-        matchingEllipses.Ellipses, matchingEllipses.PrunedEllipses)
+    let matchingEllipses = logTimeWithName "Finding ellipses" (fun () -> Ellipse.find edges xGradient yGradient config)
+
+    report 60
+
+    let prunedEllipses = logTimeWithName "Ellipses pruning" (fun () -> matchingEllipses.PrunedEllipses)
 
     report 80
 
-    let cells = logTimeWithName "Classifier" (fun () -> Classifier.findCells ellipses parasites filteredGreenWhitoutStain config)
+    let cells = logTimeWithName "Classifier" (fun () -> Classifier.findCells prunedEllipses parasites filteredGreenWhitoutStain config)
 
     report 100
 
@@ -89,11 +90,11 @@ let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) (reportPr
         saveImg parasites.infection (buildFileName " - parasites - infection.png")
 
         let imgAllEllipses = img.Copy()
-        drawEllipses imgAllEllipses allEllipses (Bgr(0.0, 240.0, 240.0)) 0.05
+        drawEllipses imgAllEllipses matchingEllipses.Ellipses (Bgr(255.0, 255.0, 255.0)) 0.04
         saveImg imgAllEllipses (buildFileName " - ellipses - all.png")
 
         let imgEllipses = filteredGreenWhitoutStain.Convert<Bgr, byte>()
-        drawEllipses imgEllipses ellipses (Bgr(0.0, 240.0, 240.0)) 1.0
+        drawEllipses imgEllipses prunedEllipses (Bgr(0.0, 240.0, 240.0)) 1.0
         saveImg imgEllipses (buildFileName " - ellipses.png")
 
         let imgCells = img.Copy()
@@ -138,10 +139,9 @@ let doMultipleAnalysis (imgs: (string * Config * Image<Bgr, byte>) list) (report
         progressPerAnalysis.AddOrUpdate(id, progress, (fun _ _ -> progress)) |> ignore
         report (progressPerAnalysis.Values.Sum() / nbImgs)
 
-    let nbConcurrentTaskLimit = 4 // To reduce the memory taken.
     let n = Environment.ProcessorCount
 
     imgs
     |> PSeq.map (fun (id, config, img) -> id, doAnalysis img id config (Some (fun p -> reportProgressImg id p)))
-    |> PSeq.withDegreeOfParallelism (if n > nbConcurrentTaskLimit then nbConcurrentTaskLimit else n)
+    |> PSeq.withDegreeOfParallelism n
     |> PSeq.toList