add ASDF system definition and related corrections

LICENCE

@@ -1,4 +1,4 @@
-MINHEAP is by Stephan Frank <defclass@googlemail.com>, 2007-2010.
+MINHEAP is by Stephan Frank <defclass@googlemail.com>, 2007-2012.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

minheap-tests.asd

@@ -0,0 +1,14 @@
+(in-package :common-lisp-user)
+
+(asdf:defsystem :minheap-tests
+  :description "Various heap/priority queue data structures; the tests"
+  :maintainer "Stephan Frank <defclass@googlemail.com>"
+  :license "BSD, see LICENSE"
+  :depends-on (:lisp-unit :minheap)
+  :components ((:module test
+                :components ((:file "binary-heap-test")
+                             (:file "fib-heap-test")
+                             (:file "pairing-heap-elmasri-test")
+                             (:file "pairing-heap-test")
+                             (:file "rank-pairing-heap-test")
+                             (:file "violation-heap-test")))))

minheap.asd

@@ -0,0 +1,15 @@
+(in-package :common-lisp-user)
+
+(asdf:defsystem :minheap
+  :description "Various heap/priority queue data structures"
+  :maintainer "Stephan Frank <defclass@googlemail.com>"
+  :license "BSD, see LICENSE"
+  :components
+  ((:file "binary-heap")
+   (:file "fib-heap")
+   (:file "pairing-heap-elmasri")
+   (:file "pairing-heap")
+   (:file "pairing-heap-listbased")
+   (:file "rank-pairing-heap")
+   (:file "splay-heap")
+   (:file "violation-heap")))

pairing-heap-listbased.lisp

@@ -19,7 +19,7 @@
 ;;;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;;;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-(defpackage :pairing-heap (:use :CL)
+(defpackage :pairing-heap-list (:use :CL)
   (:export
    #:pairing-heap
    #:clear-heap
@@ -33,7 +33,7 @@
    #:meld
    ))
 
-(in-package :pairing-heap)
+(in-package :pairing-heap-list)
 
 ;;;; Variant of pairing-heap.lisp where the children of a node are
 ;;;; implemented as a list. The code is a lot more readable, however

splay-heap.lisp

@@ -168,7 +168,7 @@
     (when tree
       (decf (slot-value heap 'size))
       (setf (slot-value heap 'tree)
-        (splay-tree-delete neap (splay-node-segment tree)))
+        (splay-tree-delete heap (splay-node-segment tree)))
       (values (splay-node-element tree)
               (splay-node-segment tree)))))