Changeset 2189 for branches/f4grobner

Timestamp:

2015-06-18T08:18:01-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/term.lisp (modified) (2 diffs)

branches/f4grobner/term.lisp

@@ -38 +38 @@
 (proclaim '(optimize (speed 3) (space 0) (safety 0) (debug 0)))
 
-(defclass term ()
-  ((monom)
-   (coeff)))
+(defclass term (monom)
+  ((coeff :init-arg :coeff :accessor term-coeff)))
 
 (defun make-term (&key monom coeff)
   (make-instance 'term :monom monom :coeff coeff))
 
-(defun make-term-variable (ring nvars pos
+(defun make-term-variable (nvars pos
                            &optional
                              (power 1)
-                             (coeff (funcall (ring-unit ring))))
+                             (coeff 1))
   "Construct a term in the polynomial ring RING[X[0],X[1],X[2],...X[NVARS-1]]
 over the ring RING which represents a single variable. It assumes
@@ -55 +54 @@
 Optionally, the term may appear with an arbitrary coefficient, which
 defaults to the unit of the RING."
-  (declare (type ring ring) (type fixnum nvars pos))
+  (declare (type fixnum nvars pos))
   (make-term :monom (make-monom-variable nvars pos power)
              :coeff coeff))
 
-(defun term-mul (ring term1 term2)
+(defmethod ring-mul ((term1 term) (term2 term))
   "Returns the product of the terms TERM1 and TERM2,
 or NIL when the product is 0. This definition takes care of divisors of 0
 in the coefficient ring."
-  (declare (type ring ring) (type term term1 term2))
-  (let ((c (funcall (ring-mul ring) (term-coeff term1) (term-coeff term2))))
-    (unless (funcall (ring-zerop ring) c)
+  (let ((c (ring-mul (term-coeff term1) (term-coeff term2))))
+    (unless (ring-zerop c)
       (make-term :monom (monom-mul (term-monom term1) (term-monom term2))
                  :coeff c))))