Changeset 727 for branches

Timestamp:

2015-06-08T20:31:40-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/monomial.lisp

@@ -73 +73 @@
 (defstruct (monom
              ;; BOA constructor
-             (:constructor make-monom ( dim 
+             (:constructor make-monom (dimension
                                         &key 
                                         (initial-contents #() initial-contents-supplied-p)
@@ -79 +79 @@
                                         (exponents (cond 
                                                      (initial-contents-supplied-p
-                                                      (make-array (list dim) :initial-contents initial-contents
+                                                      (make-array (list dimension) :initial-contents initial-contents
                                                                   :element-type 'exponent))
                                                      (initial-element-supplied-p
-                                                      (make-array (list dim) :initial-element initial-element
+                                                      (make-array (list dimension) :initial-element initial-element
                                                                   :element-type 'exponent))
-                                                     (t (make-array (list dim) :element-type 'exponent :initial-element 0)))))))
-  (dim 0 :type fixnum)
+                                                     (t (make-array (list dimension) :element-type 'exponent :initial-element 0)))))))
+  (dimension 0 :type fixnum)
   (exponents nil :type (vector exponent *)))
-
-  
-
-#|
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -100 +96 @@
 (defmacro monom-elt (m index)
   "Return the power in the monomial M of variable number INDEX."
-  `(elt ,m ,index))
-
-(defun monom-dimension (m)
-  "Return the number of variables in the monomial M."
-  (length m))
+  `(elt (monom-exponents ,m) ,index))
 
 (defun monom-total-degree (m &optional (start 0) (end (length m)))