X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaUI%2FProgram.fs;h=4cc48402fa625f95818df6695689d8bc92d69d0d;hp=a26abfc3a84a6611dc6afc0d451d39e67460bd03;hb=b87b35b922551f122228df1fd9c530bbb807935a;hpb=2e3cd07dd099944059ef5e7a7f5ef57ffe3d677b

diff --git a/Parasitemia/ParasitemiaUI/Program.fs b/Parasitemia/ParasitemiaUI/Program.fs
index a26abfc..4cc4840 100644
--- a/Parasitemia/ParasitemiaUI/Program.fs
+++ b/Parasitemia/ParasitemiaUI/Program.fs
@@ -22,7 +22,7 @@ type RunningMode =
 
 type Arguments = RunningMode * bool
 
-let parseArgs (args: string[]) : Arguments =
+let parseArgs (args : string[]) : Arguments =
 
     let output = Array.tryFindIndex ((=) "--output") args
 
@@ -46,7 +46,7 @@ let showArgsHelp () =
     printfn "    --folder <folder> : an input folder containing images to analyze"
     printfn "    --file <file> : an image file to be analyzed"
     printfn "    --output <folder> : a folder to put the results"
-    printfn "    --debug: output more information like intermediate images if set"
+    printfn "    --debug : output more information like intermediate images if set"
 
     printfn "Interactive mode:"
     printfn "  %s [<document-file>] [--debug]" System.AppDomain.CurrentDomain.FriendlyName
@@ -62,8 +62,7 @@ let main args =
     // To redirect stdout to the attached console.
     AttachConsole(-1) |> ignore // -1 to attach to the parent process.
 
-    if Array.exists (fun e -> e = "--help" || e = "-h") args
-    then
+    if Array.exists (fun e -> e = "--help" || e = "-h") args then
         showArgsHelp ()
         0
     else
@@ -77,8 +76,7 @@ let main args =
 
                     match mode with
                     | CmdLine (input, output) ->
-                        if debug
-                        then
+                        if debug then
                             config.Debug <- DebugOn output
 
                         Directory.CreateDirectory output |> ignore
@@ -87,7 +85,7 @@ let main args =
                         let listener = { new IListener with member this.NewEntry severity mess = logFile.WriteLine(mess) }
                         Log.AddListener(listener)
 
-                        Log.User (sprintf "=== New run : %A %A ===" DateTime.Now  (if debug then "[DEBUG]" else "[RELEASE]"))
+                        Log.User (sprintf "=== New run : %O %s ===" DateTime.Now  (if debug then "[DEBUG]" else "[RELEASE]"))
 
                         let files = match input with
                                     | File file -> [ file ]
@@ -104,7 +102,7 @@ let main args =
                                     let config, img = images |> List.pick (fun (id', config', img') -> if id' = id then Some (config', img') else None)
                                     img.Dispose()
                                     let total, infected = countCells cells
-                                    fprintf resultFile "File: %s %d %d %.2f (diameter: %A)\n" id total infected (100. * (float infected) / (float total)) config.RBCRadius
+                                    fprintf resultFile "File: %s %d %d %.2f (diameter: %O)\n" id total infected (100. * (float infected) / (float total)) config.RBCRadius
                             | None ->
                                 fprintf resultFile "Analysis aborted"
                             Some ())) |> ignore