Changeset 3924

Timestamp:

2016-05-29T22:36:06-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

@@ -63 +63 @@
                               &aux
                               (s (1- (length f)))
-                              (b (nconc (makelist (make-pair (elt f i) (elt f j))
+                              (b (nconc (makelist (make-instance 'critical-pair :first (elt f i) :second (elt f j))
                                                  (i 0 (1- start)) (j start s))
-                                        (makelist (make-pair (elt f i) (elt f j))
+                                        (makelist (make-instance 'critical-pair :first (elt f i) :second (elt f j))
                                                  (i start (1- s)) (j (1+ i) s)))))
   "Initializes the priority for critical pairs. F is the initial list of polynomials.
@@ -87 +87 @@
 
 (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.")
-  ((pair-key-fn :initform nil :accessor pair-key-fn)
-   (pair-order-fn :initform nil :accessor monomial-order-fn)))
+to determine the priority of critical pairs in the priority queue."))
 
 (defun make-normal-strategy (monomial-order-fn)
@@ -97 +97 @@
   (make-instance 'selection-strategy
                  :pair-key-fn #'(lambda (p q) (universal-lcm (leading-monomial p) (leading-monomial q)))
-                 :pair-order-fn #'monomial-order-fn))
+                 :pair-order-fn monomial-order-fn))
 
 (defun make-min-total-degree-strategy ()