Changeset 3945 for branches

Timestamp:

2016-05-30T00:37:06-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/pair-queue.lisp

@@ -88 +88 @@
   ((pq :initform nil :initarg :pq :accessor pq :type priority-queue)))
 
-(defmethod initialize-instance :after ((self critical-pair-queue) &key)
+(defmethod initialize-instance :after ((self critical-pair-queue) &key (f nil) (start 0))
   (with-accessors ((pair-key-fn pair-key-fn)
                    (pair-order-fn pair-order-fn)
@@ -96 +96 @@
                 :element-type 'critical-pair
                 :element-key #'(lambda (pair) (funcall pair-key-fn (critical-pair-first pair) (critical-pair-second pair)))
-                :test pair-order-fn))))
+                :test pair-order-fn))
+    (let* ((s (1- (length f)))
+           (b (nconc (makelist (make-instance 'critical-pair :first (elt f i) :second (elt f j))
+                               (i 0 (1- start)) (j start s))
+                     (makelist (make-instance 'critical-pair :first (elt f i) :second (elt f j))
+                               (i start (1- s)) (j (1+ i) s)))))
+      (dolist (pair b pq)
+        (priority-queue-insert pq pair)))
+    ))
 
 (defmethod print-object ((self critical-pair-queue) stream)