Changeset 3923 for branches

Timestamp:

2016-05-29T22:27:23-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/pair-queue.lisp

@@ -90 +90 @@
 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 :
+   (pair-order-fn :initform nil :accessor monomial-order-fn)))
 
-  (ecase method
-    ((minimal-lcm :minimal-lcm $minimal_lcm)
-     (setf *pair-key-function* #'(lambda (p q)
-                                   (universal-lcm (leading-monomial p) (leading-monomial q)))
-           *pair-order* #'reverse-monomial-order))
-    ((minimal-total-degree :minimal-total-degree $minimal_total_degree)
-     (setf *pair-key-function* #'(lambda (p q)
-                                   (total-degree
-                                    (universal-lcm (leading-monomial p) (leading-monomial q))))
-           *pair-order* #'<))
-    ((minimal-length :minimal-length $minimal_length)
-     (setf *pair-key-function* #'(lambda (p q)
-                                   (+ (poly-length p) (poly-length q)))
-           *pair-order* #'<))))
+(defun make-normal-strategy (monomial-order-fn)
+  "Make a normal selection strategy for a given monomial order. A pair
+with the minimal LCM of leading monomials is selected."
+  (make-instance 'selection-strategy
+                 :pair-key-fn #'(lambda (p q) (universal-lcm (leading-monomial p) (leading-monomial q)))
+                 :pair-order-fn #'monomial-order-fn))
 
+(defun make-min-total-degree-strategy ()
+  "Make a selection strategy where a pair with a minimum total degree of LCM 
+of leading monomials is selected."
+  (make-instance 'selection-strategy
+                 :pair-key-fn #'(lambda (p q) (total-degree (universal-lcm (leading-monomial p) (leading-monomial q))))
+                 :pair-order* #'<))
+
+(defun make-minimal-length-strategy ()
+  "Make a selection strategy where a pair with the minimum combined length of both
+polynomials is selected."
+  (make-instance 'selection-strategy
+                 :pair-key-fn #'(lambda (p q) (+ (poly-length p) (poly-length q)))
+                 :pair-order #'<))
+