Changeset 2528

Timestamp:

2015-06-19T14:20:52-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/polynomial.lisp

@@ -106 +106 @@
   self)
 
-(defmethod add-to ((self poly) (other poly)))
+(defmethod add-to ((self poly) (other poly))
+  (with-slots ((p termlist))
+      self
+    (with-slots ((q termlist))
+        other
+      (do (r)
+          ((cond
+             ((endp p)
+              (setf r (revappend r q)) t)
+             ((endp q)
+              (setf r (revappend r p)) t)
+             (t
+              (multiple-value-bind
+                    (lm-greater lm-equal)
+                  (funcall order (termlist-lm p) (termlist-lm q))
+                (cond
+                  (lm-equal
+                   (let ((s (funcall (ring-add ring) (termlist-lc p) (termlist-lc q))))
+                     (unless (funcall (ring-zerop ring) s) ;check for cancellation
+                       (setf r (cons (make-term :monom (termlist-lm p) :coeff s) r)))
+                     (setf p (cdr p) q (cdr q))))
+                  (lm-greater
+                   (setf r (cons (car p) r)
+                         p (cdr p)))
+                  (t (setf r (cons (car q) r)
+                           q (cdr q)))))
+              nil))
+           r))))
+  self)
 
 (defmethod subtract-from ((self poly) (other poly)))