Changeset 4505 for branches/f4grobner/polynomial-sugar.lisp

Timestamp:

2016-06-17T11:15:54-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/polynomial-sugar.lisp (modified) (3 diffs)

branches/f4grobner/polynomial-sugar.lisp

@@ -5 +5 @@
 the sugar value which does not assume that the object is a result of any prior calculations.")
   (:method ((object monom))
+    "Static sugar of a monom OBJECT is simply the total degree."
     (total-degree object))
   (:method ((object poly))
-    (with-slots (termlist)
+    "Static sugar of a poly OBJECT is the maximum sugar of its terms."
+  (with-slots (termlist)
         object
       (loop for trm in termlist maximize (sugar trm)))))
@@ -16 +18 @@
 (defclass monom-with-sugar (monom sugar) ())
 
+(defmethod print-object ((self monom-with-sugar) stream)
+  (print-unreadable-object (self stream :type t :identity t)
+    (with-accessors ((exponents monom-exponents) (value sugar-value))
+        self
+      (format stream "EXPONENTS=~A SUGAR=~A"
+              exponents value))))
+
+
 (defmethod shared-initialize :after ((self monom-with-sugar) slot-names &rest initargs &key)
   "Initialize sugar value based on the exponents."
@@ -21 +31 @@
   (setf (slot-value self 'value) (static-sugar self)))
 
+(defclass term-with-sugar (term sugar) ())
 
+(defmethod print-object ((self term-with-sugar) stream)
+  (print-unreadable-object (self stream :type t :identity t)
+    (with-accessors ((exponents monom-exponents) (value sugar-value) (coeff term-coeff))
+        self
+      (format stream "EXPONENTS=~A COEFF=~A SUGAR=~A"
+              exponents coeff value))))