Changeset 3520

Timestamp:

2015-09-05T14:12:09-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/polynomial.lisp

@@ -36 +36 @@
            "POLY-TERM-ORDER"
            "POLY-INSERT-TERM"
+           "POLY-ADD-TO"
            "CHANGE-TERM-ORDER"
            "STANDARD-EXTENSION"
@@ -225 +226 @@
                                    &optional
                                      (doc-string nil doc-string-supplied-p))
-  "This macro avoids code duplication for two similar operations: ADD-TO and SUBTRACT-FROM."
+  "This macro avoids code duplication for two similar operations: POLY-ADD-TO and POLY-SUBTRACT-FROM."
   `(defmethod ,add/subtract-method-name ((self poly) (other poly))
      ,@(when doc-string-supplied-p `(,doc-string))
@@ -239 +240 @@
 (eval-when (:compile-toplevel :load-toplevel :execute)
 
-  (def-add/subtract-method add-to nil
+  (def-add/subtract-method poly-add-to nil
     "Adds to polynomial SELF another polynomial OTHER.
 This operation destructively modifies both polynomials.
@@ -245 +246 @@
 no consing, entirely reusing the sells of SELF and OTHER.")
 
-  (def-add/subtract-method subtract-from unary-minus
+  (def-add/subtract-method poly-subtract-from unary-minus
     "Subtracts from polynomial SELF another polynomial OTHER.
 This operation destructively modifies both polynomials.
@@ -260 +261 @@
 (defun add-termlists (p q order-fn)
   "Destructively adds two termlists P and Q ordered according to ORDER-FN."
-  (fast-add/subtract p q order-fn #'add-to nil))
+  (fast-add/subtract p q order-fn #'poly-add-to nil))
 
 (defmacro multiply-term-by-termlist-dropping-zeros (term termlist 
@@ -309 +310 @@
 (defmethod r+ ((poly1 poly) poly2)
   "Non-destructively add POLY1 by POLY2."
-  (add-to (copy-instance POLY1) (change-class (copy-instance POLY2) 'poly)))
+  (poly-add-to (copy-instance POLY1) (change-class (copy-instance POLY2) 'poly)))
 
 (defmethod r- ((minuend poly) &rest subtrahends)
   "Non-destructively subtract MINUEND and SUBTRAHENDS."
-  (subtract-from (copy-instance minuend) 
+  (poly-subtract-from (copy-instance minuend) 
                  (change-class (reduce #'r+ subtrahends) 'poly)))
 
 (defmethod r+ ((poly1 monom) poly2)
   "Non-destructively add POLY1 by POLY2."
-  (add-to (change-class (copy-instance poly1) 'poly)
+  (poly-add-to (change-class (copy-instance poly1) 'poly)
           (change-class (copy-instance poly2) 'poly)))
 
 (defmethod r- ((minuend monom) &rest subtrahends)
   "Non-destructively subtract MINUEND and SUBTRAHENDS."
-  (subtract-from (change-class (copy-instance minuend) 'poly)
+  (poly-subtract-from (change-class (copy-instance minuend) 'poly)
                  (change-class (reduce #'r+ subtrahends) 'poly)))