Changeset 2530

Timestamp:

2015-06-19T14:36:42-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/polynomial.lisp

@@ -106 +106 @@
   self)
 
-(defmethod add-to ((self poly) (other poly) &aux r)
-  (with-slots ((p termlist))
+(defmethod add-to ((self poly) (other poly))
+  (macrolet ((lt (termlist) `(car ,termlist))
+             (lc (termlist) `(term-coeff (lt ,termlist))))
+    (with-slots ((p termlist) order)
       self
     (with-slots ((q termlist))
@@ -120 +122 @@
               (multiple-value-bind
                     (lm-greater lm-equal)
-                  (funcall order (termlist-lm p) (termlist-lm q))
+                  (funcall order (car p) (car 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
+                   (let ((s (r+ (lc p) (lc q))))
+                     (unless (r-zerop  s) ;check for cancellation
                        (setf r (cons (make-term :monom (termlist-lm p) :coeff s) r)))
                      (setf p (cdr p) q (cdr q))))