Changeset 3989

Timestamp:

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

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/priority-queue.lisp (modified) (1 diff)

branches/f4grobner/priority-queue.lisp

@@ -38 +38 @@
 (in-package :priority-queue)
 
-(defstruct (priority-queue (:constructor priority-queue-construct))
-  (heap (make-heap))
-  test)
+(defclass priority-queue ()
+  ((heap :initarg :heap :accessor priority-queue-heap)
+   (test :initarg :ters :accessor priority-queue-test))
+  (:documentation "Representa a priority queue."))
 
-(defun make-priority-queue (&key (element-type 'fixnum)
-                            (test #'<=)
-                            (element-key #'identity))
-  (priority-queue-construct
-   :heap (make-heap :element-type element-type)
-   :test #'(lambda (x y) (funcall test (funcall element-key y) (funcall element-key x)))))
+(defmethod initialize-instance ((self priority-queue) 
+                                &key 
+                                  (element-type 'fixnum)
+                                  (test #'<=)
+                                  (element-key #'identity))
+  (with-slots (heap test)
+      self
+    (setf heap (make-heap :element-type element-type)
+          test #'(lambda (x y) (funcall test (funcall element-key y) (funcall element-key x))))))
   
-(defun priority-queue-insert (pq item)
-  (heap-insert (priority-queue-heap pq) item (priority-queue-test pq)))
+(defgeneric enqueue (self item)
+  (:method ((self priority-queue) (item t))
+    (with-slots (heap test)
+        self
+    (heap-insert heap item test))))
 
 (defun priority-queue-remove (pq)