slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib: multiBalanceReport: Break calculateColumns into a separate function.

Browse Source
This commit is contained in:
Stephen Morgan 2020-06-12 11:33:51 +10:00
parent fc6a30b234
commit a72c4f285b
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hledger-lib/Hledger/Reports/MultiBalanceReport.hs
View File

@ -24,6 +24,7 @@ where
import Data.List import Data.List
import Data.List.Extra (nubSort) import Data.List.Extra (nubSort)
import Data.Map (Map)
import qualified Data.Map as M import qualified Data.Map as M
import Data.Maybe import Data.Maybe
import Data.Ord import Data.Ord
@ -138,14 +139,8 @@ multiBalanceReportWith ropts@ReportOpts{..} q j priceoracle =
-- The date spans to be included as report columns. -- The date spans to be included as report columns.
colspans = dbg "colspans" $ calculateColSpans ropts reportspan days colspans = dbg "colspans" $ calculateColSpans ropts reportspan days
-- Group postings into their columns, with the column end dates. -- Group postings into their columns.
colps :: [([Posting], Maybe Day)] = colps = dbg'' "colps" $ calculateColumns colspans ps
dbg'' "colps"
[ (posts, end) | (DateSpan _ end, posts) <- M.toList colMap ]
where
colMap = foldr addPosting emptyMap ps
addPosting (p, d) = maybe id (M.adjust (p:)) $ latestSpanContaining colspans d
emptyMap = M.fromList . zip colspans $ repeat []
---------------------------------------------------------------------- ----------------------------------------------------------------------
-- 4. Calculate account balance changes in each column. -- 4. Calculate account balance changes in each column.
@ -161,7 +156,7 @@ multiBalanceReportWith ropts@ReportOpts{..} q j priceoracle =
| tree_ ropts = filter ((depthq `matchesAccount`).aname) -- exclude deeper balances | tree_ ropts = filter ((depthq `matchesAccount`).aname) -- exclude deeper balances
| otherwise = clipAccountsAndAggregate depth -- aggregate deeper balances at the depth limit | otherwise = clipAccountsAndAggregate depth -- aggregate deeper balances at the depth limit
colacctchanges :: [[(ClippedAccountName, MixedAmount)]] = colacctchanges :: [[(ClippedAccountName, MixedAmount)]] =
dbg'' "colacctchanges" $ map (acctChangesFromPostings . fst) colps dbg'' "colacctchanges" $ map (acctChangesFromPostings . snd) $ M.toList colps
---------------------------------------------------------------------- ----------------------------------------------------------------------
-- 5. Gather the account balance changes into a regular matrix including the accounts -- 5. Gather the account balance changes into a regular matrix including the accounts
@ -384,6 +379,13 @@ calculateColSpans ropts reportspan days =
| otherwise = dbg "displayspan" $ reportspan `spanIntersect` matchedspan -- exclude leading/trailing empty intervals | otherwise = dbg "displayspan" $ reportspan `spanIntersect` matchedspan -- exclude leading/trailing empty intervals
matchedspan = dbg "matchedspan" $ daysSpan days matchedspan = dbg "matchedspan" $ daysSpan days
-- | Group postings into their columns.
calculateColumns :: [DateSpan] -> [(Posting, Day)] -> Map DateSpan [Posting]
calculateColumns colspans = foldr addPosting emptyMap
where
addPosting (p, d) = maybe id (M.adjust (p:)) $ latestSpanContaining colspans d
emptyMap = M.fromList . zip colspans $ repeat []
-- | Generates a simple non-columnar BalanceReport, but using multiBalanceReport, -- | Generates a simple non-columnar BalanceReport, but using multiBalanceReport,
-- in order to support --historical. Does not support tree-mode boring parent eliding. -- in order to support --historical. Does not support tree-mode boring parent eliding.