funds-cvs August 2007

funds-cvs@common-lisp.net

1 participants
113 discussions

[funds-cvs] r194 - trunk/funds/src
by abaine＠common-lisp.net 20 Aug '07

20 Aug '07

Author: abaine Date: Mon Aug 20 12:33:28 2007 New Revision: 194 Modified: trunk/funds/src/queue.lisp Log: Documented queue-count and queue-count-if. Modified: trunk/funds/src/queue.lisp ============================================================================== --- trunk/funds/src/queue.lisp (original) +++ trunk/funds/src/queue.lisp Mon Aug 20 12:33:28 2007 @@ -70,12 +70,14 @@ #'< :key #'car))) (defun queue-count (item q &key (key #'identity) (test #'eql)) + "The number of elements in the given queue that satisfy the test." (tree-count item (queue-heap q) :key #'(lambda (tree) (funcall key (bt-value tree))) :test test)) (defun queue-count-if (predicate q &key (key #'identity)) + "The number of elements in the given queue that satisfy the test." (tree-count-if predicate (queue-heap q) :key #'(lambda (tree) (funcall key (bt-value tree)))))

1 0

[funds-cvs] r193 - trunk/funds/src
by abaine＠common-lisp.net 20 Aug '07

20 Aug '07

Author: abaine Date: Mon Aug 20 12:30:56 2007 New Revision: 193 Modified: trunk/funds/src/package.lisp trunk/funds/src/queue.lisp Log: Substituted alternative version of queue using CLOS; I had been developing this in parallel and it makes more sense, I thirk. Modified: trunk/funds/src/package.lisp ============================================================================== --- trunk/funds/src/package.lisp (original) +++ trunk/funds/src/package.lisp Mon Aug 20 12:30:56 2007 @@ -49,7 +49,8 @@ :queue-first :queue-size :queue-as-list - :queue-from-list + :queue-count + :queue-count-if :map-queue :make-stack @@ -59,6 +60,8 @@ :stack-size :stack-from-list :stack-as-list + :stack-count + :stack-count-if :map-stack :make-dictionary Modified: trunk/funds/src/queue.lisp ============================================================================== --- trunk/funds/src/queue.lisp (original) +++ trunk/funds/src/queue.lisp Mon Aug 20 12:30:56 2007 @@ -17,10 +17,19 @@ (in-package :funds) -(defstruct queue - "A FIFO queue." - (next-priority 0) - (heap (make-heap))) +(defclass queue () + ((next-priority :initarg :next-priority + :initform 0 + :reader queue-next-priority) + (heap :initarg :heap + :initform (make-heap) + :reader queue-heap))) + +(defun make-queue (&key (initial-contents nil)) + (reduce #'(lambda (q n) + (enqueue q n)) + initial-contents + :initial-value (make-instance 'queue))) (defun queue-first (q) "The value at the head of the given queue." @@ -28,15 +37,15 @@ (defun enqueue (q item) "The queue that results when the given item is equeued on the given queue." - (make-queue :next-priority (1+ (queue-next-priority q)) - :heap (heap-insert (queue-heap q) item (queue-next-priority q)))) + (make-instance 'queue :next-priority (1+ (queue-next-priority q)) + :heap (heap-insert (queue-heap q) item (queue-next-priority q)))) (defun dequeue (q) "The queue that results when the first item is removed from the given queue." (if (queue-empty-p q) q - (make-queue :next-priority (1- (queue-next-priority q)) - :heap (heap-remove (queue-heap q))))) + (make-instance 'queue :next-priority (1- (queue-next-priority q)) + :heap (heap-remove (queue-heap q))))) (defun queue-size (q) "The number of items in the given queue." @@ -49,8 +58,8 @@ (defun map-queue (function q) "A queue containing items that are the result of applying function to the items in the given queue." - (make-queue :next-priority (queue-next-priority q) - :heap (map-tree #'(lambda (tree) + (make-instance 'queue :next-priority (queue-next-priority q) + :heap (map-tree #'(lambda (tree) (funcall function (bt-value tree))) (queue-heap q)))) @@ -60,9 +69,13 @@ (mapcar #'cdr (sort (tree-as-alist (queue-heap q)) #'< :key #'car))) -(defun queue-from-list (list) - "A queue whose elements are in the same order as the given list." - (reduce #'(lambda (q n) - (enqueue q n)) - list - :initial-value (make-queue))) +(defun queue-count (item q &key (key #'identity) (test #'eql)) + (tree-count item (queue-heap q) + :key #'(lambda (tree) + (funcall key (bt-value tree))) + :test test)) + +(defun queue-count-if (predicate q &key (key #'identity)) + (tree-count-if predicate (queue-heap q) + :key #'(lambda (tree) + (funcall key (bt-value tree)))))

1 0

[funds-cvs] r192 - trunk/funds/src
by abaine＠common-lisp.net 20 Aug '07

20 Aug '07

Author: abaine Date: Mon Aug 20 11:56:45 2007 New Revision: 192 Modified: trunk/funds/src/queue.lisp Log: Fixed enqueue naming. Modified: trunk/funds/src/queue.lisp ============================================================================== --- trunk/funds/src/queue.lisp (original) +++ trunk/funds/src/queue.lisp Mon Aug 20 11:56:45 2007 @@ -63,6 +63,6 @@ (defun queue-from-list (list) "A queue whose elements are in the same order as the given list." (reduce #'(lambda (q n) - (queue-enqueue q n)) + (enqueue q n)) list :initial-value (make-queue)))

1 0

[funds-cvs] r191 - trunk/funds/src
by abaine＠common-lisp.net 20 Aug '07

20 Aug '07

Author: abaine Date: Mon Aug 20 11:54:26 2007 New Revision: 191 Modified: trunk/funds/src/package.lisp trunk/funds/src/queue.lisp Log: Renamed enqueue and dequeue. Modified: trunk/funds/src/package.lisp ============================================================================== --- trunk/funds/src/package.lisp (original) +++ trunk/funds/src/package.lisp Mon Aug 20 11:54:26 2007 @@ -44,8 +44,8 @@ :make-queue :queue-empty-p - :queue-enqueue - :queue-dequeue + :enqueue + :dequeue :queue-first :queue-size :queue-as-list Modified: trunk/funds/src/queue.lisp ============================================================================== --- trunk/funds/src/queue.lisp (original) +++ trunk/funds/src/queue.lisp Mon Aug 20 11:54:26 2007 @@ -26,12 +26,12 @@ "The value at the head of the given queue." (heap-first (queue-heap q))) -(defun queue-enqueue (q item) +(defun enqueue (q item) "The queue that results when the given item is equeued on the given queue." (make-queue :next-priority (1+ (queue-next-priority q)) :heap (heap-insert (queue-heap q) item (queue-next-priority q)))) -(defun queue-dequeue (q) +(defun dequeue (q) "The queue that results when the first item is removed from the given queue." (if (queue-empty-p q) q

1 0

[funds-cvs] r190 - trunk/funds/src
by abaine＠common-lisp.net 20 Aug '07

20 Aug '07

Author: abaine Date: Mon Aug 20 11:48:04 2007 New Revision: 190 Modified: trunk/funds/src/dictionary.lisp trunk/funds/src/package.lisp Log: Added and exported dictionary-from-alist. Modified: trunk/funds/src/dictionary.lisp ============================================================================== --- trunk/funds/src/dictionary.lisp (original) +++ trunk/funds/src/dictionary.lisp Mon Aug 20 11:48:04 2007 @@ -56,3 +56,9 @@ (bt-value tree) (f (bt-right tree)))))) (f (dict-tree d)))) + +(defun dictionary-from-alist (alist) + (reduce #'(lambda (d pair) + (dictionary-add d (car pair) (cdr pair))) + alist + :initial-value (make-dictionary))) \ No newline at end of file Modified: trunk/funds/src/package.lisp ============================================================================== --- trunk/funds/src/package.lisp (original) +++ trunk/funds/src/package.lisp Mon Aug 20 11:48:04 2007 @@ -66,6 +66,7 @@ :dictionary-remove :dictionary-lookup :dictionary-as-alist + :dictionary-from-alist :make-f-array :f-array-elt

1 0

[funds-cvs] r189 - trunk/funds/src
by abaine＠common-lisp.net 20 Aug '07

20 Aug '07

Author: abaine Date: Mon Aug 20 11:42:10 2007 New Revision: 189 Modified: trunk/funds/src/package.lisp trunk/funds/src/stack.lisp Log: Added and exported stack-as-list and stack-from-list. Modified: trunk/funds/src/package.lisp ============================================================================== --- trunk/funds/src/package.lisp (original) +++ trunk/funds/src/package.lisp Mon Aug 20 11:42:10 2007 @@ -57,6 +57,8 @@ :stack-push :stack-top :stack-size + :stack-from-list + :stack-as-list :map-stack :make-dictionary Modified: trunk/funds/src/stack.lisp ============================================================================== --- trunk/funds/src/stack.lisp (original) +++ trunk/funds/src/stack.lisp Mon Aug 20 11:42:10 2007 @@ -48,4 +48,14 @@ (defun map-stack (function stack) "A stack whose elements are those of the given stack when function is applied to them." - (mapcar function stack)) \ No newline at end of file + (mapcar function stack)) + +(defun stack-from-list (list) + "This function is here in case the implementation of stack changes from what +it is now, a list." + list) + +(defun stack-as-list (stack) + "This function is here in case the implementation of stack changes from what +it is now, a list." + stack) \ No newline at end of file

1 0

[funds-cvs] r188 - trunk/funds/src
by abaine＠common-lisp.net 20 Aug '07

20 Aug '07

Author: abaine Date: Mon Aug 20 11:40:20 2007 New Revision: 188 Modified: trunk/funds/src/package.lisp Log: Exported queue-from-list. Modified: trunk/funds/src/package.lisp ============================================================================== --- trunk/funds/src/package.lisp (original) +++ trunk/funds/src/package.lisp Mon Aug 20 11:40:20 2007 @@ -49,6 +49,7 @@ :queue-first :queue-size :queue-as-list + :queue-from-list :map-queue :make-stack

1 0

[funds-cvs] r187 - trunk/funds/src
by abaine＠common-lisp.net 20 Aug '07

20 Aug '07

Author: abaine Date: Mon Aug 20 11:40:04 2007 New Revision: 187 Modified: trunk/funds/src/queue.lisp Log: Added queue-from-list. Modified: trunk/funds/src/queue.lisp ============================================================================== --- trunk/funds/src/queue.lisp (original) +++ trunk/funds/src/queue.lisp Mon Aug 20 11:40:04 2007 @@ -59,3 +59,10 @@ would be dequeued from the given queue." (mapcar #'cdr (sort (tree-as-alist (queue-heap q)) #'< :key #'car))) + +(defun queue-from-list (list) + "A queue whose elements are in the same order as the given list." + (reduce #'(lambda (q n) + (queue-enqueue q n)) + list + :initial-value (make-queue)))

1 0

[funds-cvs] r186 - trunk/funds/src
by abaine＠common-lisp.net 20 Aug '07

20 Aug '07

Author: abaine Date: Sun Aug 19 22:20:06 2007 New Revision: 186 Modified: trunk/funds/src/package.lisp Log: Exported queue-as-list. Modified: trunk/funds/src/package.lisp ============================================================================== --- trunk/funds/src/package.lisp (original) +++ trunk/funds/src/package.lisp Sun Aug 19 22:20:06 2007 @@ -48,6 +48,7 @@ :queue-dequeue :queue-first :queue-size + :queue-as-list :map-queue :make-stack

1 0

[funds-cvs] r185 - trunk/funds/src
by abaine＠common-lisp.net 20 Aug '07

20 Aug '07

Author: abaine Date: Sun Aug 19 22:07:40 2007 New Revision: 185 Modified: trunk/funds/src/queue.lisp Log: Added map-queue and queue-as-list. Modified: trunk/funds/src/queue.lisp ============================================================================== --- trunk/funds/src/queue.lisp (original) +++ trunk/funds/src/queue.lisp Sun Aug 19 22:07:40 2007 @@ -45,3 +45,17 @@ (defun queue-empty-p (q) "Whether the given queue does not contain any items." (tree-empty-p (queue-heap q))) + +(defun map-queue (function q) + "A queue containing items that are the result of applying function to +the items in the given queue." + (make-queue :next-priority (queue-next-priority q) + :heap (map-tree #'(lambda (tree) + (funcall function (bt-value tree))) + (queue-heap q)))) + +(defun queue-as-list (q) + "The elements in the given queue, returned as a list, in the order they +would be dequeued from the given queue." + (mapcar #'cdr (sort (tree-as-alist (queue-heap q)) + #'< :key #'car)))

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

funds-cvs August 2007