IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

[balsheet-pnl] refactor common account-balance-list adder

Browse Source 
* use fold, more efficient, removes the need for intermediate list

  (map cdr (filter filter-fn accounts-balances)): filter will create 1
  intermediate list, which is passed as an argument to map which
  creates the final list. using fold will remove the need for
  intermediate list.

* list->vector for O(1) access
This commit is contained in:
Christopher Lam 2019-11-28 22:42:31 +08:00
parent def0caa011
commit c21bb66d68
1 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
gnucash/report/standard-reports/balsheet-pnl.scm
View File

@ -909,6 +909,15 @@ also show overall period profit & loss."))
(maxindent (1+ (apply max (cons 0 (map gnc-account-get-current-depth (maxindent (1+ (apply max (cons 0 (map gnc-account-get-current-depth
accounts)))))) accounts))))))
(define (sum-balances-of-accounts alist accts adder)
(let ((balances
(fold (lambda (a b) (if (member (car a) accts) (cons (cdr a) b) b))
'() alist)))
(list->vector
(if (null? balances)
(map (const (adder)) report-dates)
(apply map adder balances)))))
(gnc:html-document-set-title! (gnc:html-document-set-title!
doc (with-output-to-string doc (with-output-to-string
(lambda () (lambda ()
@ -952,33 +961,19 @@ also show overall period profit & loss."))
(split (vector-ref date-splits col-idx))) (split (vector-ref date-splits col-idx)))
(gnc:split-anchor-text split)))) (gnc:split-anchor-text split))))
;; a list of collectors whereby collector is the sum of ;; a vector of collectors whereby collector is the sum of
;; asset and liabilities at report dates ;; asset and liabilities at report dates
(asset-liability-balances (asset-liability-balances
(let ((asset-liab-balances (sum-balances-of-accounts
(map cdr (filter accounts-balances asset-liability gnc:monetaries-add))
(lambda (acc-balances)
(member (car acc-balances) asset-liability))
accounts-balances))))
(if (null? asset-liab-balances)
(map (const (gnc:make-commodity-collector)) report-dates)
(apply map gnc:monetaries-add asset-liab-balances))))
;; a list of collectors whereby collector is the sum of ;; a vector of collectors whereby collector is the sum of
;; incomes and expenses at report dates ;; incomes and expenses at report dates
(income-expense-balances (income-expense-balances
(let ((inc-exp-balances (sum-balances-of-accounts
(map cdr accounts-balances income-expense gnc:monetaries-add))
(filter
(lambda (acc-balances)
(member (car acc-balances) income-expense))
accounts-balances))))
(if (null? inc-exp-balances)
(map (const (gnc:make-commodity-collector)) report-dates)
(map gnc:commodity-collector-get-negated
(apply map gnc:monetaries-add inc-exp-balances)))))
;; an (cons account list-of-collectors) whereby each ;; an alist of (cons account list-of-collectors) whereby each
;; collector is the split-value-balances at report ;; collector is the split-value-balances at report
;; dates. split-value-balance determined by transaction currency. ;; dates. split-value-balance determined by transaction currency.
(accounts-value-balances (accounts-value-balances
@ -988,18 +983,12 @@ also show overall period profit & loss."))
(map col-datum-get-split-value-balance cols-data)))) (map col-datum-get-split-value-balance cols-data))))
accounts)) accounts))
;; a list of collectors whereby each collector is the sum ;; a vector of collectors whereby each collector is the sum
;; of asset and liability split-value-balances at report ;; of asset and liability split-value-balances at report
;; dates ;; dates
(asset-liability-value-balances (asset-liability-value-balances
(let ((asset-liab-value-balances (sum-balances-of-accounts
(map cdr (filter accounts-value-balances asset-liability gnc:collector+))
(lambda (acc-balances)
(member (car acc-balances) asset-liability))
accounts-value-balances))))
(if (null? asset-liab-value-balances)
(map (const (gnc:make-commodity-collector)) report-dates)
(apply map gnc:collector+ asset-liab-value-balances))))
;; converts monetaries to common currency ;; converts monetaries to common currency
(monetaries->exchanged (monetaries->exchanged
@ -1024,9 +1013,9 @@ also show overall period profit & loss."))
((pricedb-latest) (current-time)) ((pricedb-latest) (current-time))
(else (list-ref report-dates col-idx)))) (else (list-ref report-dates col-idx))))
(asset-liability-balance (asset-liability-balance
(list-ref asset-liability-balances col-idx)) (vector-ref asset-liability-balances col-idx))
(asset-liability-basis (asset-liability-basis
(list-ref asset-liability-value-balances col-idx)) (vector-ref asset-liability-value-balances col-idx))
(unrealized (gnc:collector- asset-liability-basis (unrealized (gnc:collector- asset-liability-basis
asset-liability-balance))) asset-liability-balance)))
(monetaries->exchanged (monetaries->exchanged
@ -1041,7 +1030,7 @@ also show overall period profit & loss."))
((pricedb-latest) (current-time)) ((pricedb-latest) (current-time))
(else (list-ref report-dates col-idx)))) (else (list-ref report-dates col-idx))))
(income-expense-balance (income-expense-balance
(list-ref income-expense-balances col-idx))) (vector-ref income-expense-balances col-idx)))
(if (and common-currency (if (and common-currency
(every has-price? (every has-price?
(gnc:accounts-get-commodities income-expense #f))) (gnc:accounts-get-commodities income-expense #f)))