granite 0.3.0.3 → 0.3.0.4

raw patch · 3 files changed

+26/−14 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• CHANGELOG.md +3/−0
• granite.cabal +1/−1
• src/Granite.hs +22/−13

@@ -1,5 +1,8 @@ # Revision history for granite +## 0.3.0.4 -- 2025-09-26+* Fix issue with x-axis spacing when categories is greater than width.+ ## 0.3.0.3 -- 2025-09-26 * slot width for bar charts now depends on xNumTicks not categories. 

@@ -1,6 +1,6 @@ cabal-version:      3.0 name:               granite-version:            0.3.0.3+version:            0.3.0.4 synopsis:           Easy terminal plotting. description:        A terminal plotting library for quick and easy visualisation. license:            MIT

@@ -381,7 +381,7 @@             | ((name, v), col) <- zip kvs (cycle (colorPalette cfg))             ] -        nCats = length cats+        nCats = min wC (length cats)          (base, extra) =             if nCats == 0 then (0, 0) else (wC `div` nCats, wC - wC `div` nCats * nCats)@@ -1126,24 +1126,33 @@                 (Text.replicate (left + 1) " ")                 slotW                 ( if hasCategories-                    then (evenlyKeep (xNumTicks cfg) categories)+                    then (keepPercentiles (xNumTicks cfg) (length xTicks + 1) categories)                     else [xFormatter cfg (xEnv i) slotW v | (i, (_, v)) <- zip [0 ..] xTicks]                 )      in Text.unlines (attachY <> [xBar, xLine]) -evenlyKeep :: Int -> [Text] -> [Text]-evenlyKeep n xs = zipWith keep [0 ..] xs+keepPercentiles :: Int -> Int -> [Text] -> [Text]+keepPercentiles n k xs+    | k <= 0 = []+    | null xs = replicate k ""+    | n <= 1 = replicate k ""+    | otherwise = (init (map (valueAt pairs) [0 .. k - 1])) ++ [last xs]   where     m = length xs-    idxs-        | n <= 0 = []-        | n >= m = [0 .. m - 1]-        | n == 1 = [0]-        | otherwise =-            [ floor ((fromIntegral i :: Double) * fromIntegral (m - 1) / fromIntegral (n - 1))-            | i <- [0 .. n - 1]-            ]-    keep i s' = if i `elem` idxs then s' else ""+    pairs :: [(Int, Text)]+    pairs =+        [ ( slotIx+          , xs !! srcIx+          )+        | i <- [0 .. n - 2]+        , let srcIx = (i * (m - 1)) `div` (n - 1)+        , let slotIx = (i * (k - 1)) `div` (n - 1)+        ]+    valueAt :: [(Int, Text)] -> Int -> Text+    valueAt [] _ = ""+    valueAt ((j, v) : rest) i+        | i == j = v+        | otherwise = valueAt rest i  placeLabels :: Text -> Int -> [(Int, Text)] -> Text placeLabels base off = List.foldl' place base