Changeset 2195 for branches/f4grobner

Timestamp:

2015-06-18T09:07:56-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/monom.lisp

@@ -133 +133 @@
 (defmethod r* ((m1 monom) (m2 monom))
   "Multiply monomial M1 by monomial M2."
-  (with-slots ((exponents1 exponents) dim)
+  (with-slots ((exponents1 exponents) dimension)
       m1
     (with-slots ((exponents2 exponents))
@@ -139 +139 @@
       (let* ((exponents (copy-seq exponents1)))
         (map-into exponents #'+ exponents1 exponents2)
-        (make-instance 'monom :dim dim :exponents exponents)))))
+        (make-instance 'monom :dimension dimension :exponents exponents)))))
 
 
@@ -150 +150 @@
         m2
       (let* ((exponents (copy-seq exponents1))
-             (dim (reduce #'+ exponents)))
+             (dimension (reduce #'+ exponents)))
         (map-into exponents #'- exponents1 exponents2)
-        (make-instance 'monom :dim dim :exponents exponents)))))
+        (make-instance 'monom :dimension dimension :exponents exponents)))))
 
 (defmethod r-divides-p ((m1 monom) (m2 monom))
@@ -221 +221 @@
         m2
       (let* ((exponents (copy-seq exponents1))
-             (dim (reduce #'+ exponents)))
+             (dimension (reduce #'+ exponents)))
         (map-into exponents #'max exponents1 exponents2)
-        (make-instance 'monom :dim dim :exponents exponents)))))
+        (make-instance 'monom :dim dimension :exponents exponents)))))
 
 
@@ -233 +233 @@
         m2
       (let* ((exponents (copy-seq exponents1))
-             (dim (reduce #'+ exponents)))
+             (dimension (reduce #'+ exponents)))
         (map-into exponents #'min exponents1 exponents2)
-        (make-instance 'monom :dim dim :exponents exponents)))))
+        (make-instance 'monom :dim dimension :exponents exponents)))))
 
 (defmethod r-depends-p ((m monom) k)
@@ -245 +245 @@
 
 (defmethod r-tensor-product ((m1 monom) (m2 monom)
-                             &aux (dim (+ (r-dimension m1) (r-dimension m2))))
-  (declare (fixnum dim))
+                             &aux (dimension (+ (r-dimension m1) (r-dimension m2))))
+  (declare (fixnum dimension))
   (with-slots ((exponents1 exponents))
       m1
@@ -252 +252 @@
         m2
       (make-instance 'monom 
-                     :dim dim
+                     :dimension dimension
                      :exponents (concatenate 'vector exponents1 exponents2)))))