Changeset 774 for branches

Timestamp:

2015-06-08T22:14:12-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/term.lisp

@@ -60 +60 @@
                                 &optional
                                 (power 1)
-                                (coeff (funcall (ring-unit ring)))
-                                &aux
-                                (monom (make-monom nvars :initial-exponent 0)))
+                                (coeff (funcall (ring-unit ring))))
   "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
@@ -70 +68 @@
 defaults to the unit of the RING."
   (declare (fixnum nvars pos power))
-  (incf (monom-elt monom pos) power)
-  (make-term monom coeff))
+  (let ((result (make-term nvars)))
+    (setf (monom-elt result pos) power)
+    result))
 
 (defun term-mul (ring term1 term2)
@@ -79 +78 @@
   (let ((c (funcall (ring-mul ring) (term-coeff term1) (term-coeff term2))))
     (unless (funcall (ring-zerop ring) c)
-      (make-term (monom-mul term1 term2) c))))
+      (make-term (+ (monom-dimension term1) (monom-dimension term2))
+                 :initial-exponents (monom-exponents (monom-mul term1 term2))
+                 :coeff c))))
 
 (defun term-sugar (term)