Changeset 2788 for branches

Timestamp:

2015-06-20T21:04:24-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/polynomial.lisp

@@ -192 +192 @@
 
 
-(defun fast-multiply (p q)
+(defun multiply-termlists (p q)
   (cond 
     ((or (endp p) (endp q)) nil)        ;p or q is 0 (represented by NIL)
     ;; If p=p0+p1 and q=q0+q1 then p*q=p0*q0+p0*q1+p1*q
     ((endp (cdr p))
-     (term-times-termlist (car p) q))
+     (multiply-term-by-termlist (car p) q)
     ((endp (cdr q))
-     (termlist-times-term p (car q)))
+     (multiply-termlist-by-term p (car q))
     (t
-     (let ((head (term-mul-lst (termlist-lt p) (termlist-lt q)))
-           (tail (termlist-add (term-times-termlist (car p) (cdr q))
-                               (termlist-mul (cdr p) q))))
+     (let ((head (multiply-terms (car p) (car q)))
+           (tail (add-termlists (term-times-termlist (car p) (cdr q))
+                                (multiply-termlists (cdr p) q))))
        (cond ((null head) tail)
              ((null tail) head)
-             (t (nconc head tail)))))))
+             (t (nconc head tail)))))))))
 
 #|