Changeset 716

Timestamp:

2015-06-08T18:53:24-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/monomial.lisp

@@ -72 +72 @@
 
 (defstruct (monom)
-  "Type of monomial."
-  (exponents :type (simple-array exponent (*))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Construction of monomials
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defmacro make-monom (dim &key (initial-contents nil initial-contents-supplied-p)
-                               (initial-element 0 initial-element-supplied-p))
-  "Make a monomial with DIM variables. Additional argument
-INITIAL-CONTENTS specifies the list of powers of the consecutive
-variables. The alternative additional argument INITIAL-ELEMENT
-specifies the common power for all variables."
-  ;;(declare (fixnum dim))
-  `(make-array ,dim
-               :element-type 'exponent
-               ,@(when initial-contents-supplied-p `(:initial-contents ,initial-contents))
-               ,@(when initial-element-supplied-p `(:initial-element ,initial-element))))
-
+  (dim 0 :type fixnum)
+  (exponents 
+   :type (simple-array exponent (*))
+   :initform `(make-array dim
+                          :element-type 'exponent
+                          ,@(when initial-contents-supplied-p `(:initial-contents ,initial-contents))
+                          ,@(when initial-element-supplied-p `(:initial-element ,initial-element)))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;