diff --git a/src/mbase.scm b/src/mbase.scm index 2837eee..dceff16 100644 --- a/src/mbase.scm +++ b/src/mbase.scm @@ -34,8 +34,6 @@ mbase? - mbase-members - find-member-by-predicate find-member-by-id find-member-by-nick diff --git a/src/members-fees.scm b/src/members-fees.scm index 6b9e8bd..ccb94c9 100644 --- a/src/members-fees.scm +++ b/src/members-fees.scm @@ -183,9 +183,7 @@ ;; Summarizes (cons students full) counts (define (members-summary mb) - (let ((members (filter - brmember-active? - (mbase-members mb)))) + (let ((members (find-members-by-predicate mb brmember-active?))) (foldl (lambda (acc mr) (cons (+ (car acc) (if (brmember-student? mr) 1 0)) (+ (cdr acc) (if (brmember-student? mr) 0 1)))) diff --git a/src/members-print.scm b/src/members-print.scm index 91579da..2eace55 100644 --- a/src/members-print.scm +++ b/src/members-print.scm @@ -382,10 +382,9 @@ ))) (sort (if destroyed? - (mbase-members MB) - (filter (lambda (mr) - (not (brmember-destroyed? mr))) - (mbase-members MB))) + (find-members-by-predicate MB (lambda x #t)) + (find-members-by-predicate MB (lambda (mr) + (not (brmember-destroyed? mr))))) brmember mlen0 0) mlen0