Changeset 2197 for branches

Timestamp:

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

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/monom.lisp

@@ -59 +59 @@
   ((dimension          :initarg :dimension :accessor monom-dimension)
    (exponents :initarg :exponents :accessor monom-exponents))
-  (:default-initargs :dim 0 :exponents nil))
+  (:default-initargs :dimension 0 :exponents nil))
 
 (defmethod print-object ((m monom) stream)
@@ -71 +71 @@
                      (initial-exponent  nil initial-exponent-supplied-p)
                    &aux
-                     (dim (cond (dimension-suppied-p dimension)
-                                (initial-exponents-supplied-p (length initial-exponents))
-                                (t (error "You must provide DIMENSION or INITIAL-EXPONENTS"))))
+                     (dimension (cond (dimension-suppied-p dimension)
+                                      (initial-exponents-supplied-p (length initial-exponents))
+                                      (t (error "You must provide DIMENSION or INITIAL-EXPONENTS"))))
                      (exponents (cond 
                                   ;; when exponents are supplied
@@ -79 +79 @@
                                    (when (and dimension-suppied-p (/= dimension (length initial-exponents)))
                                      (error "INITIAL-EXPONENTS must have length DIMENSION"))
-                                   (make-array (list dim) :initial-contents initial-exponents
+                                   (make-array (list dimension) :initial-contents initial-exponents
                                                :element-type 'exponent))
                                   ;; when all exponents are to be identical
                                   (initial-exponent-supplied-p
-                                   (make-array (list dim) :initial-element initial-exponent
+                                   (make-array (list dimension) :initial-element initial-exponent
                                                :element-type 'exponent))
                                   ;; otherwise, all exponents are zero
                                   (t 
-                                   (make-array (list dim) :element-type 'exponent :initial-element 0)))))
+                                   (make-array (list dimension) :element-type 'exponent :initial-element 0)))))
   "A constructor (factory) of monomials. If DIMENSION is given, a sequence of
 DIMENSION elements of type EXPONENT is constructed, where individual
@@ -93 +93 @@
 Alternatively, all elements may be specified as a list
 INITIAL-EXPONENTS."
-  (make-instance 'monom :dimension dim :exponents exponents))
+  (make-instance 'monom :dimension dimension :exponents exponents))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -235 +235 @@
              (dimension (reduce #'+ exponents)))
         (map-into exponents #'min exponents1 exponents2)
-        (make-instance 'monom :dim dimension :exponents exponents)))))
+        (make-instance 'monom :dimension dimension :exponents exponents)))))
 
 (defmethod r-depends-p ((m monom) k)
@@ -260 +260 @@
   (with-slots (dimension exponents) 
       m
-    (setf dimension (- dim k)
+    (setf dimension (- dimension k)
           exponents (subseq exponents k))))