close Warning: Can't synchronize with repository "(default)" (The repository directory has changed, you should resynchronize the repository with: trac-admin $ENV repository resync '(default)'). Look in the Trac log for more information.

Ignore:
Timestamp:
2015-06-18T09:07:56-07:00 (9 years ago)
Author:
Marek Rychlik
Message:

* empty log message *

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/f4grobner/monom.lisp

    r2194 r2195  
    133133(defmethod r* ((m1 monom) (m2 monom))
    134134  "Multiply monomial M1 by monomial M2."
    135   (with-slots ((exponents1 exponents) dim)
     135  (with-slots ((exponents1 exponents) dimension)
    136136      m1
    137137    (with-slots ((exponents2 exponents))
     
    139139      (let* ((exponents (copy-seq exponents1)))
    140140        (map-into exponents #'+ exponents1 exponents2)
    141         (make-instance 'monom :dim dim :exponents exponents)))))
     141        (make-instance 'monom :dimension dimension :exponents exponents)))))
    142142
    143143
     
    150150        m2
    151151      (let* ((exponents (copy-seq exponents1))
    152              (dim (reduce #'+ exponents)))
     152             (dimension (reduce #'+ exponents)))
    153153        (map-into exponents #'- exponents1 exponents2)
    154         (make-instance 'monom :dim dim :exponents exponents)))))
     154        (make-instance 'monom :dimension dimension :exponents exponents)))))
    155155
    156156(defmethod r-divides-p ((m1 monom) (m2 monom))
     
    221221        m2
    222222      (let* ((exponents (copy-seq exponents1))
    223              (dim (reduce #'+ exponents)))
     223             (dimension (reduce #'+ exponents)))
    224224        (map-into exponents #'max exponents1 exponents2)
    225         (make-instance 'monom :dim dim :exponents exponents)))))
     225        (make-instance 'monom :dim dimension :exponents exponents)))))
    226226
    227227
     
    233233        m2
    234234      (let* ((exponents (copy-seq exponents1))
    235              (dim (reduce #'+ exponents)))
     235             (dimension (reduce #'+ exponents)))
    236236        (map-into exponents #'min exponents1 exponents2)
    237         (make-instance 'monom :dim dim :exponents exponents)))))
     237        (make-instance 'monom :dim dimension :exponents exponents)))))
    238238
    239239(defmethod r-depends-p ((m monom) k)
     
    245245
    246246(defmethod r-tensor-product ((m1 monom) (m2 monom)
    247                              &aux (dim (+ (r-dimension m1) (r-dimension m2))))
    248   (declare (fixnum dim))
     247                             &aux (dimension (+ (r-dimension m1) (r-dimension m2))))
     248  (declare (fixnum dimension))
    249249  (with-slots ((exponents1 exponents))
    250250      m1
     
    252252        m2
    253253      (make-instance 'monom
    254                      :dim dim
     254                     :dimension dimension
    255255                     :exponents (concatenate 'vector exponents1 exponents2)))))
    256256
Note: See TracChangeset for help on using the changeset viewer.