Changeset 2609 for branches

Timestamp:

2015-06-20T01:38:31-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/polynomial.lisp

@@ -113 +113 @@
       (setf p (cdr p)))))
 
-(defmethod add-to ((self poly) (other poly))
-  "Adds to polynomial SELF another polynomial OTHER.
+(defmacro def-additive-operation-method (method-name)
+  `(defmethod ,method-name ((self poly) (other poly))
+     "Adds to polynomial SELF another polynomial OTHER.
 This operation destructively modifies both polynomials.
 The result is stored in SELF. This implementation does
 no consing, entirely reusing the sells of SELF and OTHER."
-  (with-slots ((termlist1 termlist) (order1 order))
-      self
-    (with-slots ((termlist2 termlist) (order2 order))
-        other
-      ;; Ensure orders are compatible
-      (unless (eq order1 order2)
-        (setf termlist2 (sort termlist2 order1)
-              order2 order1))
-      ;; Create dummy head
-      (push nil termlist1)
-      (push nil termlist2)
-      (fast-addition termlist1 termlist2 order1 #'add-to)
-      ;; Remove dummy head
-      (pop termlist1)))
-  self)
+     (with-slots ((termlist1 termlist) (order1 order))
+         self
+       (with-slots ((termlist2 termlist) (order2 order))
+           other
+         ;; Ensure orders are compatible
+         (unless (eq order1 order2)
+           (setf termlist2 (sort termlist2 order1)
+                 order2 order1))
+         ;; Create dummy head
+         (push nil termlist1)
+         (push nil termlist2)
+         (fast-addition termlist1 termlist2 order1 #',method-name)
+         ;; Remove dummy head
+         (pop termlist1)))
+     self))
+
+(def-additive-operation-method 'add-to)
+(def-additive-operation-method 'subtract-from)
 
 (defmethod unary-uminus ((self poly)))