From rneeser at common-lisp.net Sun Dec 20 07:07:16 2009 From: rneeser at common-lisp.net (Rudy Neeser) Date: Sun, 20 Dec 2009 02:07:16 -0500 Subject: [Cl-heap-cvs] r9 - cl-heap/trunk Message-ID: Author: rneeser Date: Sun Dec 20 02:07:15 2009 New Revision: 9 Log: * binary-heap.lisp (add-to-heap, add-all-to-heap): Fixed a bug in updating the size of the DATA array in the BINARY-HEAP class. Modified: cl-heap/trunk/ChangeLog cl-heap/trunk/binary-heap.lisp Modified: cl-heap/trunk/ChangeLog ============================================================================== --- cl-heap/trunk/ChangeLog (original) +++ cl-heap/trunk/ChangeLog Sun Dec 20 02:07:15 2009 @@ -1,3 +1,8 @@ +2009-12-20 Rudy Neeser + + * binary-heap.lisp (add-to-heap, add-all-to-heap): Fixed a bug in + updating the size of the DATA array in the BINARY-HEAP class. + 2009-06-18 Rudy Neeser * fibonacci-heap.lisp (pop-heap): Fixed a bug which created an Modified: cl-heap/trunk/binary-heap.lisp ============================================================================== --- cl-heap/trunk/binary-heap.lisp (original) +++ cl-heap/trunk/binary-heap.lisp Sun Dec 20 02:07:15 2009 @@ -1,3 +1,4 @@ +(declaim (optimize (debug 3) (safety 3) (speed 0))) ;;; Copyright 2009 Rudolph Neeser . ;;; ;;; This file is part of CL-HEAP @@ -131,7 +132,7 @@ number of items in the heap." (with-slots (data (factor extension-factor)) heap - (vector-push-extend item data (ceiling (* (/ factor 100) (length data)))) + (vector-push-extend item data (ceiling (* (/ factor 100) (array-total-size data)))) (values item (percolate-up heap (1- (length data)))))) (defmethod pop-heap ((heap binary-heap)) @@ -153,7 +154,7 @@ (factor extension-factor)) heap ;; Add all items, which is linear time since no sorting occurs here. (loop for item in items - do (vector-push-extend item data (ceiling (* (/ factor 100) (length data))))) + do (vector-push-extend item data (ceiling (* (/ factor 100) (array-total-size data))))) (loop for position from (parent-position (1- (length data))) downto 0 do (percolate-down heap position))) heap) From rneeser at common-lisp.net Sun Dec 20 07:16:09 2009 From: rneeser at common-lisp.net (Rudy Neeser) Date: Sun, 20 Dec 2009 02:16:09 -0500 Subject: [Cl-heap-cvs] r10 - cl-heap/tags/release-0.1.2 Message-ID: Author: rneeser Date: Sun Dec 20 02:16:09 2009 New Revision: 10 Log: Bug fix release. Added: cl-heap/tags/release-0.1.2/ cl-heap/tags/release-0.1.2/AUTHORS - copied unchanged from r8, /cl-heap/trunk/AUTHORS cl-heap/tags/release-0.1.2/COPYING - copied unchanged from r8, /cl-heap/trunk/COPYING cl-heap/tags/release-0.1.2/ChangeLog - copied unchanged from r9, /cl-heap/trunk/ChangeLog cl-heap/tags/release-0.1.2/README - copied unchanged from r8, /cl-heap/trunk/README cl-heap/tags/release-0.1.2/binary-heap.lisp - copied unchanged from r9, /cl-heap/trunk/binary-heap.lisp cl-heap/tags/release-0.1.2/cl-heap.asd - copied unchanged from r8, /cl-heap/trunk/cl-heap.asd cl-heap/tags/release-0.1.2/condition.lisp - copied unchanged from r8, /cl-heap/trunk/condition.lisp cl-heap/tags/release-0.1.2/fibonacci-heap.lisp - copied unchanged from r8, /cl-heap/trunk/fibonacci-heap.lisp cl-heap/tags/release-0.1.2/heap.lisp - copied unchanged from r8, /cl-heap/trunk/heap.lisp cl-heap/tags/release-0.1.2/package.lisp - copied unchanged from r8, /cl-heap/trunk/package.lisp cl-heap/tags/release-0.1.2/priority-queue.lisp - copied unchanged from r8, /cl-heap/trunk/priority-queue.lisp cl-heap/tags/release-0.1.2/tests.lisp - copied unchanged from r8, /cl-heap/trunk/tests.lisp