Changeset 3927 for branches

Timestamp:

2016-05-29T23:04:29-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

@@ -52 +52 @@
               first second))))
 
-(defun make-pair-queue (pair-key-fn pair-order-fn)
-  "Constructs a priority queue for critical pairs."
-  (make-priority-queue
-   :element-type 'critical-pair
-   :element-key #'(lambda (pair) (funcall pair-key-fn (critical-pair-first pair) (critical-pair-second pair)))
-   :test pair-order-fn))
+(defclass selection-strategy ()
+  ((pair-key-fn   :initform nil :initarg :pair-key-fn :accessor pair-key-fn)
+   (pair-order-fn :initform nil :initarg :pair-order-fn :accessor pair-order-fn))
+  (:documentation "Sets up variables *PAIR-KEY-FUNCTION* and *PAIR-ORDER* used
+to determine the priority of critical pairs in the priority queue."))
+
+(defclass critical-pair-queue (selection-strategy)
+  ((pq :initform (make-priority-queue
+                  :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 pair-queue-initialize (pq f start
@@ -85 +90 @@
   (priority-queue-empty-p b))
 
-(defclass selection-strategy ()
-  ((pair-key-fn   :initform nil :initarg :pair-key-fn :accessor pair-key-fn)
-   (pair-order-fn :initform nil :initarg :pair-order-fn :accessor pair-order-fn))
-  (:documentation "Sets up variables *PAIR-KEY-FUNCTION* and *PAIR-ORDER* used
-to determine the priority of critical pairs in the priority queue."))
 
 (defun make-normal-strategy (monomial-order-fn)