Changeset 4143 for branches

Timestamp:

2016-06-02T19:21:09-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/pair-queue.lisp

@@ -30 +30 @@
            "+MIN-TOTAL-DEGREE-STRATEGY+"
            "+MIN-COMBINED-LENGTH-STRATEGY+"
-           "MAKE-CRITICAL-PAIR-QUEUE"
+           "MAKE-CRITICAL-PAIRS"
            )
   (:documentation "Critical pair queue implementation. The pair queue is a list of critical
@@ -103 +103 @@
   (:documentation "Implements critical pair priority queue."))
 
-(defmethod initialize-instance :after ((self critical-pair-queue) &key strategy poly-list start)
-  "Allocates a priority queue SELF for critical pairs from strategy SELF."
-  (declare (ignore poly-list start))
+(defmethod initialize-instance :after ((self critical-pair-queue) &key (strategy +normal-strategy+))
+  "Initializes a priority queue SELF for critical pairs from strategy SELF."
   (with-slots (pair-key-fn pair-order-fn)
       strategy
     (call-next-method self
-                           :element-type 'critical-pair
-                           :element-key #'(lambda (pair) (funcall pair-key-fn 
-                                                                  (critical-pair-first pair)
-                                                                  (critical-pair-second pair)))
-                           :test pair-order-fn)))
+                      :element-type 'critical-pair
+                      :element-key #'(lambda (pair) (funcall pair-key-fn 
+                                                             (critical-pair-first pair)
+                                                             (critical-pair-second pair)))
+                      :test pair-order-fn)))
 
 (defun make-critical-pairs (poly-list &optional (start 0)
@@ -126 +125 @@
                    (makelist (make-instance 'critical-pair :first (elt poly-list i) :second (elt poly-list j))
                              (i start (1- s)) (j (1+ i) s))))
-#|
 
-      (dolist (pair b self)
-        (enqueue self pair)))))
-|#
+(defgeneric enqueue-critical-pairs (self pair-lst)
+  (:method ((self critical-pair-queue) pair-lst)
+    (dolist (pair pair-lst self)
+      (enqueue self pair))))