Changeset 2586 for branches

Timestamp:

2015-06-20T00:20:08-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/polynomial.lisp (modified) (1 diff)

branches/f4grobner/polynomial.lisp

@@ -113 +113 @@
 The result is stored in SELF. This implementation does
 no consing, entirely reusing the sells of SELF and OTHER."
-    (with-slots ((termlist1 termlist))
-        self
-      (with-slots ((termlist2 termlist))
-          other
-        (do ((p termlist1)
-             (q termlist2))
-            ((or (endp p) (endp q)))
-          (multiple-value-bind 
-                (greater-p equal-p)
-              (lex> (lt q) (lt p))
-            (cond
-              (greater-p 
-               ;; P' <- Q
-               ;; (CDR P') <- P
-               ;; Q' <- (CDR Q)
-               (rotatef p q (cdr q))
-               (print p) (print q))
-              (equal-p
-               (setf (lc p) (+ (lc p) (lc q))
-                     p (cdr p)
-                     q (cdr q))
-               (print p) (print q))
-              (t 
-               (setf p (cdr p)))))))))
-            
+  (with-slots ((termlist1 termlist))
+      self
+    (with-slots ((termlist2 termlist))
+        other
+      (setf termlist1 (fast-add-to termlist1 termlist2))))
   self)