Changeset 3940

Timestamp:

2016-05-29T23:51:29-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/pair-queue.lisp

@@ -54 +54 @@
 
 (defclass selection-strategy ()
-  ((pair-key-fn   :initform (error "Must specify PAIR-KEY-FN") :initarg :pair-key-fn :accessor pair-key-fn)
-   (pair-order-fn :initform (error "Must specify PAIR-ORDER-FN") :initarg :pair-order-fn :accessor pair-order-fn))
-  (:documentation "Represents a critical pair selection strategy.  The
-two ingredients of a strategy is a function PAIR-KEY-FUNCTION which
-computes a key from the critical pair, which can be any type of data,
-and a function PAIR-ORDER-FN used to compaire the calculated keys to
-determine which pair is more promising and should be considered first."))
+  ((pair-key-fn :initform #'(lambda (p q) (universal-lcm (leading-monomial p) (leading-monomial q))))
+   (pair-order-fn :initform #'lex>))
+  (:documentation "Represents the normal critical pair selection
+strategy.  The two ingredients of a strategy is a function
+PAIR-KEY-FUNCTION which computes a key from the critical pair, which
+can be any type of data, and a function PAIR-ORDER-FN used to compaire
+the calculated keys to determine which pair is more promising and
+should be considered first.
+The normal selection strategy for a given monomial order PAIR-ORDER-FN consists in
+selecting the pair with the minimal LCM of leading monomials first."))
 
 (defmethod print-object ((self selection-strategy) stream)
@@ -69 +72 @@
       (format stream "PAIR-KEY-FN=~A PAIR-ORDER-FN=~A" 
               pair-key-fn pair-order-fn))))
-
-(defclass normal-selection-strategy (selection-strategy) 
-  ((pair-key-fn :initform #'(lambda (p q) (universal-lcm (leading-monomial p) (leading-monomial q))))
-   (pair-order-fn :initform #'lex>))
-  (:documentation "The normal selection strategy for a given monomial order MONOMIAL-ORDER-FN. A pair
-with the minimal LCM of leading monomials is selected."))
 
 (defclass min-total-degree-strategy (selection-strategy)
@@ -89 +86 @@
 
 (defclass critical-pair-queue (selection-strategy)
-  ((pq :type priority-queue)))
+  ((pq :initform nil :initarg :pq :accessor pq :type priority-queue)))
 
 (defmethod initialize-instance :after ((self critical-pair-queue) &key)
-  (with-slots (pair-key-fn pair-order-fn pq)
+  (with-accessors ((pair-key-fn pair-key-fn)
+                   (pair-order-fn pair-order-fn)
+                   (pq pq))
       (setf pq (make-priority-queue
                 :element-type 'critical-pair