Changeset 4540 for branches

Timestamp:

2016-06-18T17:15:00-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/polynomial.lisp

@@ -394 +394 @@
                ))))))))
 
+(defun s-add (p q order-fn add-fn &aux result)
+  "Non-recursive version of SLOW-ADD. This version uses auxillary variable
+RESULT which serves as a stack for the terms of the sum of P and Q. This version
+is nearly twice as fast on some tests."
+  (loop 
+     (cond
+       ((endp p) (return-from s-add (nreconc result q)))
+       ((endp q) (return-from s-add (nreconc result p)))
+       (t 
+        (multiple-value-bind 
+              (greater-p equal-p)
+            (funcall order-fn (car p) (car q))
+          (cond
+            (greater-p                  ; (> (car p) (car q))
+             (push (pop p) result)
+             )
+            (equal-p                    ; (= (car p)) (car q))
+             (let ((s (funcall add-fn (lc p) (lc q))))
+               (cond 
+                 ((universal-zerop s)
+                  (pop p))
+                 (t 
+                  ;; Adjust the lc of p
+                  (setf (lc p) s)
+                  (push (pop p) result)
+                  )
+                 ))
+             (pop q)
+             )
+            (t      ;(< (car p) (car q))                        
+             (push (pop q) result)
+             )
+            ))))))
+
 (defun fast-add (p q order-fn add-fn)
   "This version calls SLOW-ADD and is bullet-proof."
-  (slow-add p q order-fn add-fn)
+  ;;(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)
+  (s-add p q order-fn add-fn)
   )