Changeset 848 for branches

Timestamp:

2015-06-09T08:48:20-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/monomial.lisp

@@ -75 +75 @@
              ;; NOTE: having a non-default constructor inhibits reading via #S(...)
              (:constructor make-monom (&key 
-                                       (dimension 0 dimension-suppied-p)
-                                       (initial-exponents #() initial-exponents-supplied-p)
-                                       (initial-exponent  #() initial-exponent-supplied-p)
+                                       (dimension nil dimension-suppied-p)
+                                       (initial-exponents nil initial-exponents-supplied-p)
+                                       (initial-exponent  nil initial-exponent-supplied-p)
                                        &aux
+                                       (dim (cond (dimension-suppied-p dimension)
+                                                  (initial-exponents-supplied-p (length exponents))
+                                                  (t (error "You must provide DIMENSION nor INITIAL-EXPONENTS"))))
                                        (exponents (cond 
                                                     ;; when exponents are supplied
                                                     (initial-exponents-supplied-p
-                                                     (make-array (list dimension) :initial-contents initial-exponents
+                                                     (make-array (list dim) :initial-contents initial-exponents
                                                                  :element-type 'exponent))
                                                     ;; when all exponents are to be identical
                                                     (initial-exponent-supplied-p
-                                                     (make-array (list dimension) :initial-element initial-exponent
+                                                     (make-array (list dim) :initial-element initial-exponent
                                                                  :element-type 'exponent))
                                                     ;; otherwise, all exponents are zero
-                                                    (t (make-array (list dimension) :element-type 'exponent :initial-element 0))))))
+                                                    (t (make-array (list dim) :element-type 'exponent :initial-element 0))))))
              )
   (exponents nil :type (vector exponent *)))