Changeset 2593

Timestamp:

2015-06-20T00:42:55-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/polynomial.lisp

@@ -86 +86 @@
   self)
 
-(defun fast-add-to (p q)
+(defun fast-add-to (p q order-fn)
   "Fast destructive addition of termlists
 Note that this assumes the presence of a
@@ -98 +98 @@
       (multiple-value-bind 
             (greater-p equal-p)
-          (lex> (lt q) (lt p))
+          (funcall order-fn (lt q) (lt p))
         (cond
           (greater-p
@@ -115 +115 @@
 The result is stored in SELF. This implementation does
 no consing, entirely reusing the sells of SELF and OTHER."
-  (with-slots ((termlist1 termlist))
+  (with-slots ((termlist1 termlist) (order1 order))
       self
-    (with-slots ((termlist2 termlist))
+    (with-slots ((termlist2 termlist) (order2 order))
         other
+      (unless (eq order1 order2)
+        (setf termlist2 (sort order1 termlist2)))
       ;; Create dummy head
       (push nil termlist1)
       (push nil termlist2)
-      (fast-add-to termlist1 termlist2)
+      (fast-add-to termlist1 termlist2 order1)
       ;; Remove dummy head
       (pop termlist1)))