projects
/
master-thesis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix an out-of-bound array access.
[master-thesis.git]
/
Parasitemia
/
Parasitemia
/
Program.fs
diff --git
a/Parasitemia/Parasitemia/Program.fs
b/Parasitemia/Parasitemia/Program.fs
index
ac17c82
..
d7348cf
100644
(file)
--- a/
Parasitemia/Parasitemia/Program.fs
+++ b/
Parasitemia/Parasitemia/Program.fs
@@
-71,7
+71,10
@@
let main args =
doGSigma2 = 20.
doGLowFreqPercentageReduction = 0.75
doGSigma2 = 20.
doGLowFreqPercentageReduction = 0.75
- darkStainLevel = 0.5
+ factorNbPick = 2.0
+ factorWindowSize = 1.6
+
+ darkStainLevel = 0.4 // Lower -> more sensitive.
stainSigma = 10.
stainLevel = 0.9
stainSigma = 10.
stainLevel = 0.9
@@
-85,31
+88,34
@@
let main args =
MaxDarkStainRatio = 0.1
MaxDarkStainRatio = 0.1
- minimumCellArea =
6
00. * scale ** 2. |> int
+ minimumCellArea =
12
00. * scale ** 2. |> int
maxOffcenter = 0.5 }
match mode with
| CmdLine (input, output) ->
let config = { config with debug = DebugOn output }
maxOffcenter = 0.5 }
match mode with
| CmdLine (input, output) ->
let config = { config with debug = DebugOn output }
- Utils.log <- (fun m -> Console.WriteLine m)
Directory.CreateDirectory output |> ignore
Directory.CreateDirectory output |> ignore
+ use logFile = new StreamWriter(new FileStream(Path.Combine(output, "log.txt"), FileMode.Append, FileAccess.Write))
+ Utils.log <- (fun m -> logFile.WriteLine(m))
+ Utils.log (sprintf "=== New run : %A ===" DateTime.Now)
+
let files = match input with
| File file -> [ file ]
| Dir dir -> Directory.EnumerateFiles dir |> List.ofSeq
let files = match input with
| File file -> [ file ]
| Dir dir -> Directory.EnumerateFiles dir |> List.ofSeq
- use resultFile = new StreamWriter(new FileStream(Path.Combine(output, "results.txt"), FileMode.
Create
, FileAccess.Write))
+ use resultFile = new StreamWriter(new FileStream(Path.Combine(output, "results.txt"), FileMode.
Append
, FileAccess.Write))
for file in files do
try
for file in files do
try
- let fileInfo = FileInfo(file)
use img = new Image<Bgr, byte>(file)
use img = new Image<Bgr, byte>(file)
- let cells = Utils.logTime "Whole analyze" (fun () -> ImageAnalysis.doAnalysis img fileInfo.Name config)
+ Utils.log (sprintf "== File: %A" file)
+ let cells = Utils.logTime "Whole analyze" (fun () -> ImageAnalysis.doAnalysis img (FileInfo(file).Name) config)
let total, infected = Utils.countCells cells
fprintf resultFile "File: %s %d %d %.2f\n" file total infected (100. * (float infected) / (float total))
with
let total, infected = Utils.countCells cells
fprintf resultFile "File: %s %d %d %.2f\n" file total infected (100. * (float infected) / (float total))
with
- |
_
as ex -> Utils.log (sprintf "Unable to open the image '%A': %A" file ex)
+ |
:? IOException
as ex -> Utils.log (sprintf "Unable to open the image '%A': %A" file ex)
0
| Window ->
0
| Window ->