From 01294fd24f2b022237a0efff8da1d386c73e2748 Mon Sep 17 00:00:00 2001 From: Filip Gralinski Date: Mon, 3 Aug 2020 22:41:46 +0200 Subject: [PATCH] Fix bugs when formatting percentages --- src/GEval/Formatting.hs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/GEval/Formatting.hs b/src/GEval/Formatting.hs index 210b4d7..ea6fac3 100644 --- a/src/GEval/Formatting.hs +++ b/src/GEval/Formatting.hs @@ -26,12 +26,11 @@ formatTheResultWithErrorBounds format pointEstimate (Just errorBound) = (formatS formatSimpleResult :: FormattingOptions -> MetricValue -> String formatSimpleResult = \case - FormattingOptions (Just prec) True -> printf "%.*f" (prec-2) . (*100) + FormattingOptions (Just prec) True -> printf "%.*f" (max 0 (prec-2)) . (*100) FormattingOptions (Just prec) _ -> printf "%.*f" prec _ -> show selectLowerPrecision :: Int -> FormattingOptions -> FormattingOptions selectLowerPrecision p = \case - a@(FormattingOptions _ True) -> a - FormattingOptions (Just prec) _ -> FormattingOptions (Just $ min prec p) False - _ -> FormattingOptions (Just p) False + FormattingOptions (Just prec) showAsPercentage -> FormattingOptions (Just $ min prec p) showAsPercentage + FormattingOptions (Nothing) showAsPercentage -> FormattingOptions (Just p) showAsPercentage