Changeset 3322 for branches

Timestamp:

2015-06-23T10:15:11-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/monom.lisp

@@ -136 +136 @@
 
 (defmethod multiply-by ((self monom) (other monom))
-  (with-slots ((exponents1 exponents) (dimension1 dimension))
-      self
-    (with-slots ((exponents2 exponents) (dimension2 dimension))
+  (with-slots ((exponents1 exponents))
+      self
+    (with-slots ((exponents2 exponents))
         other
-      (unless (= dimension1 dimension2)
-        (error "Incompatible dimensions: ~A and ~A.~%" dimension1 dimension2))
+      (unless (= (length exponents1) (length exponents2))
+        (error "Incompatible dimensions"))
       (map-into exponents1 #'+ exponents1 exponents2)))
   self)
 
 (defmethod divide-by ((self monom) (other monom))
-  (with-slots ((exponents1 exponents) (dimension1 dimension))
-      self
-    (with-slots ((exponents2 exponents) (dimension2 dimension))
+  (with-slots ((exponents1 exponents))
+      self
+    (with-slots ((exponents2 exponents))
         other
-      (unless (= dimension1 dimension2)
-        (error "Incompatible dimensions: ~A and ~A.~%" dimension1 dimension2))
+      (unless (= (length exponents1) (length exponents2))
+        (error "Incompatible dimensions"))
       (map-into exponents1 #'- exponents1 exponents2)))
   self)
@@ -226 +226 @@
 (defmethod r-lcm ((m1 monom) (m2 monom)) 
   "Returns least common multiple of monomials M1 and M2."
-  (with-slots ((exponents1 exponents) (dimension1 dimension))
+  (with-slots ((exponents1 exponents))
       m1
     (with-slots ((exponents2 exponents))
@@ -233 +233 @@
              (dimension dimension1))
         (map-into exponents #'max exponents1 exponents2)
-        (make-instance 'monom :dimension dimension :exponents exponents)))))
+        (make-instance 'monom :exponents exponents)))))
 
 
 (defmethod r-gcd ((m1 monom) (m2 monom))
   "Returns greatest common divisor of monomials M1 and M2."
-  (with-slots ((exponents1 exponents) (dimension1 dimension))
-      m1
-    (with-slots ((exponents2 exponents))
-        m2
-      (let* ((exponents (copy-seq exponents1))
-             (dimension dimension1))
+  (with-slots ((exponents1 exponents))
+      m1
+    (with-slots ((exponents2 exponents))
+        m2
+      (let* ((exponents (copy-seq exponents1)))
         (map-into exponents #'min exponents1 exponents2)
-        (make-instance 'monom :dimension dimension :exponents exponents)))))
+        (make-instance 'monom :exponents exponents)))))
 
 (defmethod r-depends-p ((m monom) k)