Changeset 3997 for branches/f4grobner

Timestamp:

2016-05-30T21:22:49-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/priority-queue.lisp (modified) (2 diffs)

branches/f4grobner/priority-queue.lisp

@@ -37 +37 @@
   (:documentation "Representa a priority queue."))
 
-(defmethod initialize-instance ((self priority-queue) 
+(defmethod initialize-instance :after ((self priority-queue) 
                                 &key 
                                   (element-type 'fixnum)
                                   (test #'<=)
                                   (element-key #'identity))
-  (with-slots (heap test)
+  (with-accessors ((heap priority-queue-heap) 
+                   (test-x priority-queue-test))
       self
     (setf heap (make-heap :element-type element-type)
-          test #'(lambda (x y) (funcall test (funcall element-key y) (funcall element-key x))))))
+          test-x #'(lambda (x y) (funcall test (funcall element-key y) (funcall element-key x))))))
   
 (defgeneric enqueue (self item)
@@ -51 +52 @@
     (with-slots (heap test)
         self
-    (heap-insert heap item test))))
+      (heap-insert heap item test))
+    self))
 
 (defgeneric dequeue (self)