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

cash-flow.scm: Use hashtables for accounts as well

Browse Source
This commit is contained in:
Peter Broadbery 2015-11-09 22:16:26 +00:00
parent eb600c79a4
commit c26b81bff8
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/report/standard-reports/cash-flow.scm
View File

@ -397,12 +397,14 @@
(include-trading-accounts (cdr (assq 'include-trading-accounts settings))) (include-trading-accounts (cdr (assq 'include-trading-accounts settings)))
(to-report-currency (cdr (assq 'to-report-currency settings))) (to-report-currency (cdr (assq 'to-report-currency settings)))
(is-report-account? (account-in-list-pred accounts))
(money-in-accounts '()) (money-in-accounts '())
(money-in-alist '()) (money-in-hash (make-hash-table))
(money-in-collector (gnc:make-commodity-collector)) (money-in-collector (gnc:make-commodity-collector))
(money-out-accounts '()) (money-out-accounts '())
(money-out-alist '()) (money-out-hash (make-hash-table))
(money-out-collector (gnc:make-commodity-collector)) (money-out-collector (gnc:make-commodity-collector))
(all-splits (gnc:account-get-trans-type-splits-interval accounts '() from-date-tp to-date-tp)) (all-splits (gnc:account-get-trans-type-splits-interval accounts '() from-date-tp to-date-tp))
@ -446,46 +448,44 @@
(if (and ;; make sure we don't have (if (and ;; make sure we don't have
(not (null? s-account)) ;; any dangling splits (not (null? s-account)) ;; any dangling splits
(or include-trading-accounts (not (eq? s-account-type ACCT-TYPE-TRADING))) (or include-trading-accounts (not (eq? s-account-type ACCT-TYPE-TRADING)))
(not (account-in-list? s-account accounts))) (not (is-report-account? s-account)))
(if (not (split-seen? s)) (if (not (split-seen? s))
(begin (begin
(if (gnc-numeric-negative-p s-value) (if (gnc-numeric-negative-p s-value)
(let ((pair (account-in-alist s-account money-in-alist))) (let ((s-account-in-collector (account-hashtable-ref money-in-hash s-account)))
;(gnc:debug "in:" (gnc-commodity-get-printname s-commodity) ;(gnc:debug "in:" (gnc-commodity-get-printname s-commodity)
; (gnc-numeric-to-double s-amount) ; (gnc-numeric-to-double s-amount)
; (gnc-commodity-get-printname parent-currency) ; (gnc-commodity-get-printname parent-currency)
; (gnc-numeric-to-double s-value)) ; (gnc-numeric-to-double s-value))
(if (not pair) (if (not s-account-in-collector)
(begin (begin
(set! pair (list s-account (gnc:make-commodity-collector))) (set! s-account-in-collector (gnc:make-commodity-collector))
(set! money-in-alist (cons pair money-in-alist)) (account-hashtable-set! money-in-hash s-account
s-account-in-collector)
(set! money-in-accounts (cons s-account money-in-accounts)) (set! money-in-accounts (cons s-account money-in-accounts))
;(gnc:debug money-in-alist)
) )
) )
(let ((s-account-in-collector (cadr pair)) (let ((s-report-value (to-report-currency parent-currency
(s-report-value (to-report-currency parent-currency
(gnc-numeric-neg s-value) (gnc-numeric-neg s-value)
(gnc-transaction-get-date-posted (gnc-transaction-get-date-posted
parent)))) parent))))
(money-in-collector 'add report-currency s-report-value) (money-in-collector 'add report-currency s-report-value)
(s-account-in-collector 'add report-currency s-report-value)) (s-account-in-collector 'add report-currency s-report-value))
) )
(let ((pair (account-in-alist s-account money-out-alist))) (let ((s-account-out-collector (account-hashtable-ref money-out-hash s-account)))
;(gnc:debug "out:" (gnc-commodity-get-printname s-commodity) ;(gnc:debug "out:" (gnc-commodity-get-printname s-commodity)
; (gnc-numeric-to-double s-amount) ; (gnc-numeric-to-double s-amount)
; (gnc-commodity-get-printname parent-currency) ; (gnc-commodity-get-printname parent-currency)
; (gnc-numeric-to-double s-value)) ; (gnc-numeric-to-double s-value))
(if (not pair) (if (not s-account-out-collector)
(begin (begin
(set! pair (list s-account (gnc:make-commodity-collector))) (set! s-account-out-collector (gnc:make-commodity-collector))
(set! money-out-alist (cons pair money-out-alist)) (account-hashtable-set! money-out-hash s-account
s-account-out-collector)
(set! money-out-accounts (cons s-account money-out-accounts)) (set! money-out-accounts (cons s-account money-out-accounts))
;(gnc:debug money-out-alist)
) )
) )
(let ((s-account-out-collector (cadr pair)) (let ((s-report-value (to-report-currency parent-currency
(s-report-value (to-report-currency parent-currency
s-value s-value
(gnc-transaction-get-date-posted (gnc-transaction-get-date-posted
parent)))) parent))))
@ -512,10 +512,10 @@
(calc-money-in-out-internal accounts) (calc-money-in-out-internal accounts)
;; Return an association list of results ;; Return an association list of results
(list (cons 'money-in-accounts money-in-accounts) (list (cons 'money-in-accounts money-in-accounts)
(cons 'money-in-alist money-in-alist) (cons 'money-in-alist (hash-map->list (lambda (k v) (list k v)) money-in-hash))
(cons 'money-in-collector money-in-collector) (cons 'money-in-collector money-in-collector)
(cons 'money-out-accounts money-out-accounts) (cons 'money-out-accounts money-out-accounts)
(cons 'money-out-alist money-out-alist) (cons 'money-out-alist (hash-map->list (lambda (k v) (list k v)) money-out-hash))
(cons 'money-out-collector money-out-collector)))) (cons 'money-out-collector money-out-collector))))
(gnc:define-report (gnc:define-report