Changeset 2607

Timestamp:

2015-06-20T01:34:04-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/polynomial.lisp

@@ -91 +91 @@
   self)
 
-(defun fast-add-to (p q order-fn)
-  "Fast destructive addition of termlists P and Q, ordered by
-predicate ORDER-FN. Note that this assumes the presence of a dummy
-header."
+
+(defun fast-addition (method-name p q order-fn add-fun)
   (macrolet ((lt (x) `(cadr ,x))
              (lc (x) `(r-coeff (cadr ,x))))
@@ -108 +106 @@
            (rotatef (cdr p) (cdr q)))
           (equal-p
-           (let ((s (add-to (lc p) (lc q))))
+           (let ((s (funcall add-fun (lc p) (lc q))))
              (if (r-zerop s)
                  (setf (cdr p) (cddr p))
@@ -131 +129 @@
       (push nil termlist1)
       (push nil termlist2)
-      (fast-add-to termlist1 termlist2 order1)
+      (fast-addition termlist1 termlist2 order1 #'add-to)
       ;; Remove dummy head
       (pop termlist1)))