Changeset 2448 for branches

Timestamp:

2015-06-19T10:15:19-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/polynomial.lisp

@@ -134 +134 @@
   (length (poly-termlist self)))
 
-(defmethod multiply-by-scalar ((self poly) scalar)
-  "The scalar product of a polynomial SELF by a scalar SCALAR."
-  (mapc #'(lambda (term) (multiply-by-scalar term scalar)) (poly-termlist self))
-  self)
-
-(defun multiply-by-monom ((self poly) (monom monom))
-  (mapc #'(lambda (term) (r* term monom)) (poly-termlist self))
-  self)
-
-
-(defun term-times-poly (ring term p)
-  (declare (type ring ring) (type term term) (type poly p))
-  (make-poly-from-termlist 
-   (term-times-termlist ring term (poly-termlist p))
-   (+ (poly-sugar p) (term-sugar term))))
-
-(defun poly-add (ring-and-order p q)
-  (declare (type ring-and-order ring-and-order) (type poly p q))
-  (make-poly-from-termlist 
-   (termlist-add ring-and-order 
-                 (poly-termlist p) 
-                 (poly-termlist q))
-   (max (poly-sugar p) (poly-sugar q))))
-
-(defun poly-sub (ring-and-order p q)
-  (declare (type ring-and-order ring-and-order) (type poly p q))
-  (make-poly-from-termlist 
-   (termlist-sub ring-and-order (poly-termlist p) (poly-termlist q))
-   (max (poly-sugar p) (poly-sugar q))))
-
-(defun poly-uminus (ring p)
-  (declare (type ring ring) (type poly p))
-  (make-poly-from-termlist 
-   (termlist-uminus ring (poly-termlist p))
-   (poly-sugar p)))
-
-(defun poly-mul (ring-and-order p q)
-  (declare (type ring-and-order ring-and-order) (type poly p q))
-  (make-poly-from-termlist
-   (termlist-mul ring-and-order (poly-termlist p) (poly-termlist q))
-   (+ (poly-sugar p) (poly-sugar q))))
-
-(defun poly-expt (ring-and-order p n)
-  (declare (type ring-and-order ring-and-order) (type poly p))
-  (make-poly-from-termlist (termlist-expt ring-and-order (poly-termlist p) n) (* n (poly-sugar p))))
+(defgeneric multiply-by (self other)
+  (:method ((self poly) (other scalar))
+    (mapc #'(lambda (term) (multiply-by term other)) (poly-termlist self))
+    self)
+  (:method ((self poly) (other monom))
+    (mapc #'(lambda (term) (multiply-by term monom)) (poly-termlist self))
+    self))
+
+(defgeneric add-to (self other)
+  (:method ((self poly) (other poly))))
+
+(defgeneric subtract-from (self other)
+  (:method ((self poly) (other poly))))
+
+(defmethod unary-uminus (self))
 
 (defun poly-append (&rest plist)