projects
/
master-thesis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Add the analysis window.
[master-thesis.git]
/
Parasitemia
/
Parasitemia
/
Program.fs
diff --git
a/Parasitemia/Parasitemia/Program.fs
b/Parasitemia/Parasitemia/Program.fs
index
bb61f4f
..
038f827
100644
(file)
--- a/
Parasitemia/Parasitemia/Program.fs
+++ b/
Parasitemia/Parasitemia/Program.fs
@@
-4,8
+4,6
@@
open System
open System.IO
open System.Threading
open System.IO
open System.Threading
-open FSharp.Collections.ParallelSeq
-
open Emgu.CV
open Emgu.CV.Structure
open Emgu.CV
open Emgu.CV.Structure
@@
-48,6
+46,7
@@
let main args =
Config(
{
initialAreaOpen = 2000
Config(
{
initialAreaOpen = 2000
+ ratioSecondAreaOpen = 1.f / 3.f
minRbcRadius = -0.3f
maxRbcRadius = 0.3f
minRbcRadius = -0.3f
maxRbcRadius = 0.3f
@@
-56,7
+55,7
@@
let main args =
factorNbPick = 1.0
factorNbPick = 1.0
- darkStainLevel = 0.25 //
Lower -> more sensitive. 0.3. Careful about illumination on the borders.
+ darkStainLevel = 0.25 //
0.3
maxDarkStainRatio = 0.1 // 10 %
infectionArea = 0.012f // 1.2 %
maxDarkStainRatio = 0.1 // 10 %
infectionArea = 0.012f // 1.2 %
@@
-67,7
+66,7
@@
let main args =
maxStainRatio = 0.12 // 12 %
standardDeviationMaxRatio = 0.5 // 0.55
maxStainRatio = 0.12 // 12 %
standardDeviationMaxRatio = 0.5 // 0.55
- minimumCellArea = 0.5f })
+ minimumCellArea
Factor
= 0.5f })
match mode with
| CmdLine (input, output) ->
match mode with
| CmdLine (input, output) ->
@@
-88,18
+87,13
@@
let main args =
use resultFile = new StreamWriter(new FileStream(Path.Combine(output, "results.txt"), FileMode.Append, FileAccess.Write))
//try
use resultFile = new StreamWriter(new FileStream(Path.Combine(output, "results.txt"), FileMode.Append, FileAccess.Write))
//try
- let images =
seq { for file in files -> Path.GetFileNameWithoutExtension(FileInfo(file).Name), new Image<Bgr, byte>(file) }
+ let images =
[ for file in files -> Path.GetFileNameWithoutExtension(FileInfo(file).Name), new Image<Bgr, byte>(file) ]
- let nbConcurrentTaskLimit = 4
- let n = Environment.ProcessorCount
Utils.logTime "Whole analyze" (fun () ->
Utils.logTime "Whole analyze" (fun () ->
- let results =
- images
- |> PSeq.map (fun (id, img) -> id, ImageAnalysis.doAnalysis img id (config.Copy()))
- |> PSeq.withDegreeOfParallelism (if n > nbConcurrentTaskLimit then nbConcurrentTaskLimit else n)
+ let results = ImageAnalysis.doMultipleAnalysis images config None
- for id, cells in results do
+ for id,
_,
cells in results do
let total, infected = Utils.countCells cells
fprintf resultFile "File: %s %d %d %.2f\n" id total infected (100. * (float infected) / (float total)))
let total, infected = Utils.countCells cells
fprintf resultFile "File: %s %d %d %.2f\n" id total infected (100. * (float infected) / (float total)))