Changeset 2213

Timestamp:

2015-06-18T10:33:28-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/monom.lisp

@@ -65 +65 @@
 
 (defmethod initialize-instance :after ((self monom)
-                                  &key
-                                    (dimension nil dimension-suppied-p)
-                                    (exponents nil exponents-supplied-p)
-                                    (exponent  nil exponent-supplied-p))
+                                       &key
+                                         (dimension nil dimension-suppied-p)
+                                         (exponents nil exponents-supplied-p)
+                                         (exponent  nil exponent-supplied-p))
   "A constructor (factory) of monomials. If DIMENSION is given, a
 sequence of DIMENSION elements of type EXPONENT is constructed, where
@@ -74 +74 @@
 to 0.  Alternatively, all elements may be specified as a list
 EXPONENTS."
-  (setf (slot-value self 'dimension) (cond (dimension-suppied-p 
-                                            dimension)
-                                           (exponents-supplied-p 
-                                            (length exponents))
-                                           (t 
-                                            (error "You must provide DIMENSION or EXPONENTS")))
-        (slot-value self 'exponents) (cond 
-                                       ;; when exponents are supplied
-                                       (exponents-supplied-p
-                                        (when (and dimension-suppied-p
-                                                   (/= dimension (length exponents)))
-                                          (error "EXPONENTS must have length DIMENSION"))
-                                        (make-array (list dimension) :initial-contents exponents
-                                                    :element-type 'exponent))
-                                       ;; when all exponents are to be identical
-                                       (exponent-supplied-p
-                                        (make-array (list dimension) :initial-element exponent
-                                                    :element-type 'exponent))
-                                       ;; otherwise, all exponents are zero
-                                       (t 
-                                        (make-array (list dimension) :element-type 'exponent :initial-element 0)))))
+  (format t "INITIALIZE-INSTANCE called with SELF ~A, DIMENSION ~A, EXPONENTS ~A, EXPONENT ~A.~%"
+          self dimension exponents exponent)
+  (let ((new-dimension (cond (dimension-suppied-p dimension)
+                             (exponents-supplied-p 
+                              (length exponents))
+                             (t 
+                              (error "You must provide DIMENSION or EXPONENTS"))))
+        (new-exponents  (cond 
+                          ;; when exponents are supplied
+                          (exponents-supplied-p
+                           (make-array (list dimension) :initial-contents exponents
+                                       :element-type 'exponent))
+                          ;; when all exponents are to be identical
+                          (exponent-supplied-p
+                           (make-array (list dimension) :initial-element exponent
+                                       :element-type 'exponent))
+                          ;; otherwise, all exponents are zero
+                          (t 
+                           (make-array (list dimension) :element-type 'exponent :initial-element 0)))))
+))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;