Changeset 3910 for branches

Timestamp:

2016-05-29T20:08:59-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

@@ -27 +27 @@
 
 (defpackage "PAIR-QUEUE"
-  (:use :cl :priority-queue :monomial :order :polynomial :utils)
+  (:use :cl :priority-queue :monom :polynomial :utils)
   (:export "SUGAR-PAIR-KEY"
            "PAIR"
@@ -50 +50 @@
 (in-package :pair-queue)
 
-(defun sugar-pair-key (p q &aux (lcm (monom-lcm (poly-lm p) (poly-lm q)))
-                                (d (monom-sugar lcm)))
+(defun sugar-pair-key (p q &aux (lcm (universal-lcm (leading-monomial p) (leading-monomial q)))
+                                (d (sugar lcm)))
   "Returns list (S LCM-TOTAL-DEGREE) where S is the sugar of the S-polynomial of
 polynomials P and Q, and LCM-TOTAL-DEGREE is the degree of LCM(LM(P),LM(Q))."
   (declare (type poly p q) (type monom lcm) (type fixnum d))
   (cons (max 
-         (+  (- d (monom-sugar (poly-lm p))) (poly-sugar p))
-         (+  (- d (monom-sugar (poly-lm q))) (poly-sugar q)))
+         (+  (- d (sugar (leading-monomial p))) (poly-sugar p))
+         (+  (- d (sugar (leading-monomial q))) (poly-sugar q)))
         lcm))
 
@@ -133 +133 @@
     ((minimal-lcm :minimal-lcm $minimal_lcm)
      (setf *pair-key-function* #'(lambda (p q)
-                                   (monom-lcm (poly-lm p) (poly-lm 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)
                                    (monom-total-degree
-                                    (monom-lcm (poly-lm p) (poly-lm q))))
+                                    (universal-lcm (leading-monomial p) (leading-monomial q))))
            *pair-order* #'<))
     ((minimal-length :minimal-length $minimal_length)