Changeset 2549

Timestamp:

2015-06-19T16:02:31-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/polynomial.lisp (modified) (2 diffs)

branches/f4grobner/polynomial.lisp

@@ -112 +112 @@
           other
         (do ((p termlist1  (cdr p))
-             (q termlist2))
+             (q termlist2)
+             lm-equal)
             ((endp p)
              ;; Include remaining terms of termlist1
@@ -118 +119 @@
           ;; Copy all initial terms of q greater than (lt p) into p       
           (do ((r q (cdr q)))
-              ((lex> (lt r) (lt p)))
+              ((multiple-value-bind 
+                     (greater-p equal-p)
+                   (lex> (lt r) (lt p))
+                 ;; Save the info about equality of last copied term
+                 (setf last-equal equal-p)
+                 greater-p))
             (push (lt r) p))
           ;; Now compare leading terms of p and q
           (cond
-            ((monom= (lt p) (lt q))
+            (last-equal
              ;; Simply add coefficients
              (setf (lc p) (add-to (lc p) (lc q)))))))))