Changeset 936

Timestamp:

2015-06-09T19:14:02-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/termlist.lisp

@@ -195 +195 @@
 ;; Multiplication of polynomials
 ;; Non-destructive version
-(defun termlist-mul (ring p q)
-  (declare (ring ring))
+(defun termlist-mul (ring-and-order p q
+                     &aux 
+                       (ring (ro-ring ring-and-order))
+                       (order (ro-order ring-and-order)))
+  (declare (ring-and-order ring-and-order))
   (cond ((or (endp p) (endp q)) nil)    ;p or q is 0 (represented by NIL)
         ;; If p=p0+p1 and q=q0+q1 then pq=p0q0+p0q1+p1q
@@ -205 +208 @@
         (t
          (let ((head (term-mul-lst ring (termlist-lt p) (termlist-lt q)))
-               (tail (termlist-add ring (term-times-termlist ring (car p) (cdr q))
-                                   (termlist-mul ring (cdr p) q))))
+               (tail (termlist-add ring-and-order
+                                   (term-times-termlist ring (car p) (cdr q))
+                                   (termlist-mul ring-and-order (cdr p) q))))
            (cond ((null head) tail)
                  ((null tail) head)