Changeset 3922 for branches

Timestamp:

2016-05-29T21:59:49-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/pair-queue.lisp

@@ -53 +53 @@
               first second))))
 
-  
-(defun make-pair-queue ()
+(defun make-pair-queue (pair-key-fn pair-order-fn)
   "Constructs a priority queue for critical pairs."
   (make-priority-queue
-   :element-type 'pair
-   :element-key #'(lambda (pair) (funcall *pair-key-function* (pair-first pair) (pair-second pair)))
-   :test *pair-order*))
+   :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
@@ -87 +86 @@
   (priority-queue-empty-p b))
 
-(defun set-pair-heuristic (method)
-  "Sets up variables *PAIR-KEY-FUNCTION* and *PAIR-ORDER* used
-to determine the priority of critical pairs in the priority queue."
+(defclass selection-strategy ()
+  (:documentation "Sets up variables *PAIR-KEY-FUNCTION* and *PAIR-ORDER* used
+to determine the priority of critical pairs in the priority queue.")
+  ((pair-key-fn :initform nil :accessor pair-key-fn)
+   (pair-order-fn :initform nil :
+
   (ecase method
     ((minimal-lcm :minimal-lcm $minimal_lcm)