Changeset 2201

Timestamp:

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

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/monom.lisp

@@ -64 +64 @@
   (princ (slot-value m 'exponents) stream))
 
-(defun make-monom (&key 
-                     (dimension nil dimension-suppied-p)
-                     (initial-exponents nil initial-exponents-supplied-p)
-                     (initial-exponent  nil initial-exponent-supplied-p)
-                   &aux
-                     (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
-                                  (initial-exponents-supplied-p
-                                   (when (and dimension-suppied-p (/= dimension (length initial-exponents)))
-                                     (error "INITIAL-EXPONENTS must have length DIMENSION"))
-                                   (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 dimension) :initial-element initial-exponent
-                                               :element-type 'exponent))
-                                  ;; otherwise, all exponents are zero
-                                  (t 
-                                   (make-array (list dimension) :element-type 'exponent :initial-element 0)))))
+(defmethod initialize-instance ((self monom)
+                                (dimension nil dimension-suppied-p)
+                                (initial-exponents nil initial-exponents-supplied-p)
+                                (initial-exponent  nil initial-exponent-supplied-p))
   "A constructor (factory) of monomials. If DIMENSION is given, a
 sequence of DIMENSION elements of type EXPONENT is constructed, where
@@ -91 +73 @@
 to 0.  Alternatively, all elements may be specified as a list
 INITIAL-EXPONENTS."
-  (make-instance 'monom :dimension dimension :exponents exponents))
+  (with-slots (dimension exponents)
+      self
+    (setf 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
+                      (initial-exponents-supplied-p
+                       (when (and dimension-suppied-p (/= dimension (length initial-exponents)))
+                         (error "INITIAL-EXPONENTS must have length DIMENSION"))
+                       (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 dimension) :initial-element initial-exponent
+                                   :element-type 'exponent))
+                      ;; otherwise, all exponents are zero
+                      (t 
+                       (make-array (list dimension) :element-type 'exponent :initial-element 0)))))
+  (call-next-method))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;