Changeset 2082 for branches/f4grobner

Timestamp:

2015-06-17T19:31:45-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/monom.lisp

@@ -232 +232 @@
 (defmethod ring-lcm ((m1 monom) (m2 monom)) 
   "Returns least common multiple of monomials M1 and M2."
-  (let* ((exponents (copy-seq exponents1))
-         (dim (reduce #'+ exponents)))
-    (map-into exponents #'max exponents1 exponents2)
-    (make-instance 'monom :dim dim :exponents exponents)))))
-
-
-(defun monom-gcd (m1 m2 &aux (result (copy-seq m1)))
+  (with-slots (exponents1 exponents)
+      m1
+    (with-slots (exponents2 exponents)
+        m2
+      (let* ((exponents (copy-seq exponents1))
+             (dim (reduce #'+ exponents)))
+        (map-into exponents #'max exponents1 exponents2)
+        (make-instance 'monom :dim dim :exponents exponents)))))
+
+
+(defmethod ring-gcd ((m1 monom) (m2 monom))
   "Returns greatest common divisor of monomials M1 and M2."
-  (declare (type monom m1 m2 result))
-  (map-into result #'min m1 m2))
+  (with-slots (exponents1 exponents)
+      m1
+    (with-slots (exponents2 exponents)
+        m2
+      (let* ((exponents (copy-seq exponents1))
+             (dim (reduce #'+ exponents)))
+        (map-into exponents #'min exponents1 exponents2)
+        (make-instance 'monom :dim dim :exponents exponents)))))
 
 (defun monom-depends-p (m k)