From 37180398da12c35e028f0f08635814be30bb6ab5 Mon Sep 17 00:00:00 2001 From: Jed Barber Date: Mon, 23 Jan 2017 19:41:29 +1100 Subject: Verbosity now outputs to stderr --- src/main.hs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/main.hs') diff --git a/src/main.hs b/src/main.hs index b0baaa4..8cec703 100644 --- a/src/main.hs +++ b/src/main.hs @@ -4,6 +4,7 @@ import qualified System.Environment as Env import qualified System.Console.GetOpt as Opt import qualified System.Exit as Ex import qualified System.Directory as Dir +import qualified System.IO as IO import qualified Control.Monad as Con import qualified Data.Maybe as Maybe import qualified Counter as Sen @@ -174,18 +175,19 @@ main = do -- set up the election processing + Con.when (isVerbose options) $ IO.hPutStrLn IO.stderr "Reading candidate data..." (aboveBallot, belowBallot) <- Cand.readCandidates candidateFile state - Con.when (isVerbose options) $ putStrLn "Reading preference data..." + Con.when (isVerbose options) $ IO.hPutStrLn IO.stderr "Reading preference data..." counter <- Sen.createSenateCounter preferenceFile aboveBallot belowBallot - Con.when (isVerbose options) $ putStrLn "Done.\n" + Con.when (isVerbose options) $ IO.hPutStrLn IO.stderr "Done.\n" Dir.createDirectory outputDir - Con.when (isVerbose options) $ putStrLn "Setting up election..." + Con.when (isVerbose options) $ IO.hPutStrLn IO.stderr "Setting up election..." election <- Elt.createElection outputDir counter numToElect (isVerbose options) - Con.when (isVerbose options) $ putStrLn "Done.\n" + Con.when (isVerbose options) $ IO.hPutStrLn IO.stderr "Done.\n" -- run the show - Con.when (isVerbose options) $ putStrLn "Running...\n" + Con.when (isVerbose options) $ IO.hPutStrLn IO.stderr "Running...\n" Elt.doCount election -- cgit