Changeset 4124 for branches

Timestamp:

2016-06-01T14:18:19-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/criterion.lisp (modified) (4 diffs)

branches/f4grobner/criterion.lisp

@@ -40 +40 @@
 in G pointed to by the integers in PAIR have disjoint (relatively prime)
 monomials. This test is known as the first Buchberger criterion."
-  (declare (type pair pair))
-  (let ((f (pair-first pair))
-        (g (pair-second pair)))
+  (declare (type critical-pair pair))
+  (let ((f (critical-pair-first pair))
+        (g (critical-pair-second pair)))
     (when (rel-prime-p (leading-monomial f) (leading-monomial g))
       (debug-cgb ":1")
@@ -48 +48 @@
 
 (defun criterion-2 (pair b-done partial-basis
-                    &aux (f (pair-first pair)) (g (pair-second pair))
+                    &aux (f (critical-pair-first pair)) (g (critical-pair-second pair))
                          (place :before))
   "Returns T if the leading monomial of some element P of
@@ -55 +55 @@
 each of the polynomials pointed to by the the PAIR has already been
 treated, as indicated by the absence in the hash table B-done."
-  (declare (type pair pair) (type hash-table b-done)
+  (declare (type critical-pair pair) (type hash-table b-done)
            (type poly f g))
   ;; In the code below we assume that pairs are ordered as follows: 
@@ -71 +71 @@
       #+grobner-check(assert (eq place :in-the-middle))
       (setf place :after))
-     ((and (monom-divides-monom-lcm-p (leading-monomial h) (leading-monomial f) (leading-monomial g))
+     ((and (divides-lcm-p (leading-monomial h) (leading-monomial f) (leading-monomial g))
            (gethash (case place
                       (:before (list h f))