Changeset 3879

Timestamp:

2016-05-28T21:23:10-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/polynomial.lisp

@@ -292 +292 @@
      self))
 
-(eval-when (:load-toplevel :execute)
-
-  (def-add/subtract-method add-to nil
-    "Adds to polynomial SELF another polynomial OTHER.
+(defmethod add-to ((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.")
-
-  (def-add/subtract-method subtract-from unary-minus
+no consing, entirely reusing the sells of SELF and OTHER."
+  (change-term-order other self)
+  (setf (poly-termlist self) (add-termlists
+                              (poly-termlist self) (poly-termlist other)
+                              (poly-term-order self))))
+  
+
+(defmethod subtract-from ((self poly) (other poly))
     "Subtracts from 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.")
-  )
+no consing, entirely reusing the sells of SELF and OTHER."
+  (change-term-order other self)
+  (setf (poly-termlist self) (subtract-termlists
+                              (poly-termlist self) (poly-termlist other)
+                              (poly-term-order self))))
 
 (defmethod unary-minus ((self poly))