Changeset 3933

Timestamp:

2016-05-29T23:33:00-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

@@ -76 +76 @@
 with the minimal LCM of leading monomials is selected."))
 
+(defclass min-total-degree-strategy (selection-strategy)
+  ((pair-key-fn :initform #'(lambda (p q) (total-degree (universal-lcm (leading-monomial p) (leading-monomial q)))))
+   (pair-order* #'<))
+  (:documentation "Make a selection strategy where a pair with a
+minimum total degree of LCM of leading monomials is selected."))
+
+(defclass minimal-length-strategy (selection-strategy)
+  ((pair-key-fn #'(lambda (p q) (+ (poly-length p) (poly-length q))))
+   (pair-order #'<))
+  (:documentation "Make a selection strategy where a pair with the minimum combined length of both
+polynomials is selected."))
+
+
 
 (defclass critical-pair-queue ()
@@ -111 +124 @@
 
 
-(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 #'<))
-