Changeset 4494 for branches

Timestamp:

2016-06-16T20:47:29-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/polynomial.lisp

@@ -334 +334 @@
 |#
 
-
-
-
-#|
-(defun fast-add (p q order-fn add-fn)
-  "Add two polynomials, P and Q, represented as lists of terms.
-The operation is destructive to both polynomials, as the terms
-of both lists are combined into the result. The operation does not
-create any new instance of TERM."
-  (macrolet ((lc (x) `(term-coeff (car ,x))))
-    (do (r)
-        ((or (endp p) (endp q))
-         ;; NOTE: R contains the result in reverse order. Can it
-         ;; be more efficient to produce the terms in correct order?
-         (unless (endp q) 
-           (setf r (nreconc r q)))
-         (unless (endp p)
-           (setf r (nreconc r p)))
-         r)
-      (multiple-value-bind 
-            (greater-p equal-p)
-          (funcall order-fn (car p) (car q))
-        (cond
-          (greater-p
-           (rotatef (cdr p) r p)
-           )
-          (equal-p
-           (let ((s (funcall add-fn (lc p) (lc q))))
-             (cond 
-               ((universal-zerop s)
-                (setf p (cdr p))
-                )
-               (t 
-                (setf (lc p) s)
-                (rotatef (cdr p) r p))))
-           (setf q (cdr q))
-           )
-          (t 
-           (rotatef (cdr q) r q)))))))
-|#
-
 ;; Shorthand for leading coefficient of a termlist
 (defmacro lc (x) `(term-coeff (car ,x)))
@@ -453 +412 @@
   (slow-add p q order-fn add-fn)
   ;;(fast-and-risky-add p q order-fn add-fn)
+  ;;(f-add p q order-fn add-fn)
+  ;;(s-add p q order-fn add-fn)
   )