Changeset 2022 for branches

Timestamp:

2015-06-17T15:34:57-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/monom.lisp

@@ -74 +74 @@
   'fixnum)
 
-(deftype monom (&optional dim)
-  "Type of monomial."
-  `(simple-array exponent (,dim)))
+(defclass monom ()
+  ((dim       :initarg :dimension)
+   (exponents :initarg :exponents))
+  (:default-initargs :dim 0 :exponents nil))
 
 ;; If a monomial is redefined as structure with slot EXPONENTS, the function
@@ -88 +89 @@
                                 (initial-exponents-supplied-p (length initial-exponents))
                                 (t (error "You must provide DIMENSION nor INITIAL-EXPONENTS"))))
-                     (monom (cond 
-                              ;; when exponents are supplied
-                              (initial-exponents-supplied-p
-                               (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 dim) :initial-element initial-exponent
-                                           :element-type 'exponent))
-                              ;; otherwise, all exponents are zero
-                              (t 
-                               (make-array (list dim) :element-type 'exponent :initial-element 0)))))
+                     (exponents (cond 
+                                  ;; when exponents are supplied
+                                  (initial-exponents-supplied-p
+                                   (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 dim) :initial-element initial-exponent
+                                               :element-type 'exponent))
+                                  ;; otherwise, all exponents are zero
+                                  (t 
+                                   (make-array (list dim) :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
@@ -105 +106 @@
 Alternatively, all elements may be specified as a list
 INITIAL-EXPONENTS."
-  monom)
+  (make-instance 'monom :dim dim :exponents exponents))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;