X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FProgram.fs;h=76fc244f9e8c56a4433dc5ef8c8f56a4b9d85a43;hp=ac17c82b0c9d00ab47b4752942338f7fde4ac9e3;hb=5b68d946369f998865d2dd330fd3b374b2b9a0ad;hpb=e76da913cd58078ad2479357b2430ed62a6e0777

diff --git a/Parasitemia/Parasitemia/Program.fs b/Parasitemia/Parasitemia/Program.fs
index ac17c82..76fc244 100644
--- a/Parasitemia/Parasitemia/Program.fs
+++ b/Parasitemia/Parasitemia/Program.fs
@@ -91,21 +91,24 @@ let main args =
         match mode with
         | CmdLine (input, output) ->
             let config = { config with debug = DebugOn output }
-            Utils.log <- (fun m -> Console.WriteLine m)
 
             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
 
-            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
-                    let fileInfo = FileInfo(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