Changeset 4170 for branches/f4grobner/pair-queue.lisp

Timestamp:

2016-06-03T02:03:26-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

Moved files infix-errors* to junk

File:

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

branches/f4grobner/pair-queue.lisp

@@ -125 +125 @@
                    (i start (1- s)) (j (1+ i) s))))
 
-(defgeneric enqueue-critical-pairs (self pair-lst)
+(defgeneric enqueue-critical-pairs (self pair-lst) 
+  (:documentation "Place pairs in PAIR-LST on the queue SELF.")
   (:method ((self critical-pair-queue) pair-lst)
+    "Enqueue into queue QUEUE the elements of the list PAIR-LST."
     (dolist (pair pair-lst self)
       (enqueue self pair))))
-
 
 (defgeneric make-critical-pair-queue (object &optional poly-lst start)
@@ -136 +137 @@
     (with-slots (pair-key-fn pair-order-fn)
         object
-      (make-instance 'critical-pair-queue
-                     :element-key #'(lambda (pair)
-                                      (funcall pair-key-fn 
-                                               (critical-pair-first pair)
-                                               (critical-pair-second pair)))
-                     :test pair-order-fn))))
+      (let ((queue (make-instance 'critical-pair-queue
+                                  :element-key #'(lambda (pair)
+                                                   (funcall pair-key-fn 
+                                                            (critical-pair-first pair)
+                                                            (critical-pair-second pair)))
+                                  :test pair-order-fn)))
+           (enqueue-critical-pairs queue (make-critical-pairs poly-lst start))))))