Changeset 4457 for branches

Timestamp:

2016-06-13T20:28:56-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/polynomial.lisp (modified) (9 diffs)

branches/f4grobner/polynomial.lisp

@@ -76 +76 @@
 
 (defclass poly (ring)
-  ((dimension :initform nil 
-              :initarg :dimension 
-              :accessor poly-dimension
-              :documentation "Shared dimension of all terms, the number of variables")
-   (termlist :initform nil :initarg :termlist :accessor poly-termlist
+  ((termlist :initform nil :initarg :termlist :accessor poly-termlist
              :documentation "List of terms.")
    (order :initform #'lex> :initarg :order :accessor poly-term-order
           :documentation "Monomial/term order."))
-  (:default-initargs :dimension nil :termlist nil :order #'lex>)
+  (:default-initargs :termlist nil :order #'lex>)
   (:documentation "A polynomial with a list of terms TERMLIST, ordered
 according to term order ORDER, which defaults to LEX>."))
@@ -90 +86 @@
 (defmethod print-object ((self poly) stream)
   (print-unreadable-object (self stream :type t :identity t)
-    (with-accessors ((dimension poly-dimension)
-                     (termlist poly-termlist)
+    (with-accessors ((termlist poly-termlist)
                      (order poly-term-order))
         self
-      (format stream "DIMENSION=~A TERMLIST=~A ORDER=~A" 
-              dimension termlist order))))
+      (format stream "TERMLIST=~A ORDER=~A" 
+              termlist order))))
 
 (defmethod copy-instance :around ((object poly)  &rest initargs &key &allow-other-keys)
@@ -115 +110 @@
     self))
 
+(defgeneric poly-dimension (object)
+  (:documentation "The number of variables in the polynomial OBJECT")
+  (:method ((object poly))
+    (monom-dimension (leading-monomial object))))
+
 (defgeneric poly-insert-term (self term)
   (:documentation "Insert a term TERM into SELF before all other
 terms. Order is not enforced.")
   (:method ((self poly) (term term))
-    (cond ((null (poly-dimension self))
-           (setf (poly-dimension self) (monom-dimension term)))
-          (t (assert (= (poly-dimension self) (monom-dimension term)))))
+    (with-slots (termlist)
+        self
+      (unless (endp termlist)
+        (assert (= (monom-dimension (car termlist)) (monom-dimension term)))))
     (push term (poly-termlist self))
     self))
@@ -133 +134 @@
   (:documentation "Append a term TERM to SELF after all other terms. Order is not enforced.")
   (:method ((self poly) (term term))
-    (cond ((null (poly-dimension self))
-           (setf (poly-dimension self) (monom-dimension term)))
-          (t (assert (= (poly-dimension self) (monom-dimension term)))))
-    (setf (cdr (last (poly-termlist self))) (list term))
+    (with-slots (termlist)
+        self
+      (unless (endp termlist)
+        (assert (= (monom-dimension (car termlist)) (monom-dimension term))))
+      (setf (cdr (last (poly-termlist self))) (list term)))
     self))
 
@@ -182 +184 @@
 (defmethod update-instance-for-different-class :after ((old term) (new poly) &key)
   "Converts OLD of class TERM to a NEW of class POLY, by making it into a 1-element TERMLIST."
-  (reinitialize-instance new
-                         :dimension (monom-dimension old)
-                         :termlist (list old)))
+  (reinitialize-instance new :termlist (list old)))
 
 (defmethod update-instance-for-different-class :after ((old monom) (new poly) &key)
   "Converts OLD of class MONOM to a NEW of class POLY, by making it into a 1-element TERMLIST."
-  (reinitialize-instance new
-                         :dimension (monom-dimension old)
-                         :termlist (list (change-class old 'term))))
+  (reinitialize-instance new :termlist (list (change-class old 'term))))
   
 (defmethod universal-equalp ((self poly) (other poly))
   "Implements equality of polynomials."
-  (and (eql (poly-dimension self) (poly-dimension other))
-       (every #'universal-equalp (poly-termlist self) (poly-termlist other))
-       (eq (poly-term-order self) (poly-term-order other))))
+  (and 
+   ;(eql (poly-dimension self) (poly-dimension other))
+   (every #'universal-equalp (poly-termlist self) (poly-termlist other))
+   (eq (poly-term-order self) (poly-term-order other))))
 
 (defgeneric leading-term (object)
@@ -597 +596 @@
                         (t (list prod)))))
                 (poly-termlist self)))
-  (incf (poly-dimension self) (monom-dimension other))
   self)
 
@@ -608 +606 @@
                         (t (list prod)))))
                 (poly-termlist self)))
-  (incf (poly-dimension self) (monom-dimension other))
   self)
 
@@ -741 +738 @@
   "Ensures that the number of variables in VARS maches the polynomial dimension of the
 polynomial SELF."
-  (with-slots (dimension)
-      self
+  (let ((dimension (poly-dimension self)))
     (assert (= (length vars) dimension)
             nil
@@ -764 +760 @@
 
 (defmethod make-zero-for ((self poly))
-  (make-instance 'poly :dimension (poly-dimension self)))
+  (make-instance 'poly))
 
 (defmethod make-unit-for ((self poly))