Changeset 4144 for branches

Timestamp:

2016-06-02T19:29:52-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/pair-queue.lisp (modified) (1 diff)

branches/f4grobner/pair-queue.lisp

@@ -99 +99 @@
 polynomials is selected.")
 
-(defclass critical-pair-queue (priority-queue) 
-  ()
-  (:documentation "Implements critical pair priority queue."))
-
-(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)))
+(defgeneric make-critical-pair-queue (object) 
+  (:documentation "A factory of critical-pair-queue objects.")
+  (:method ((self strategy))
+    "Creates a priority queue with selection strategy STRATEGY."
+    (with-slots (pair-key-fn pair-order-fn)
+        strategy
+      (make-instance 'pair-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 make-critical-pairs (poly-list &optional (start 0)