Changeset 4514

Timestamp:

2016-06-17T12:18:47-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/polynomial-sugar.lisp

@@ -32 +32 @@
   (setf (slot-value self 'value) (static-sugar self)))
 
+(defmethod update-instance-for-different-class :after ((old monom) (new monom-with-sugar) &key)
+  "Add sugar to every term."
+  (reinitialize-instance new :value (static-sugar new)))
+
+
 (defmethod multiply-by :after ((self sugar) (other sugar))
   (with-slots (value)
@@ -64 +69 @@
   (setf (slot-value self 'value) (static-sugar self)))
 
+(defmethod update-instance-for-different-class :after ((old poly) (new poly-with-sugar) &key)
+  "Add sugar to every term."
+  (reinitialize-instance new :termlist (mapc #'(lambda (trm) (change-class trm 'term-with-sugar)) (poly-termlist new))))
+
+(defmethod update-instance-for-different-class :after ((old poly-with-sugar) (new poly) &key)
+  "Drop sugar in every term."
+  (reinitialize-instance new :termlist (mapc #'(lambda (trm) (change-class trm 'term)) (poly-termlist new))))
+
+
 (defmethod add-to ((self poly-with-sugar) (other poly-with-sugar))
   "Sugar value of the sum of two polynomials, SELF and OTHER, is by definition
-the maximum of the sugar values of the two polynomials."
+the maximum of the sugar values of the summands."
   (with-accessors ((value sugar-value))
       self
     (with-accessors ((other-value sugar-value))
         other
-      (setf value (max value other-value)))))
+      (setf value (max value other-value))))
+  self)
+
+(defmethod multiply-by ((self poly-with-sugar) (other poly-with-sugar))
+  "Sugar value of the product of two polynomials, SELF and OTHER, is by definition
+the sum of the sugar values of the factors."
+  (with-accessors ((value sugar-value))
+      self
+    (with-accessors ((other-value sugar-value))
+        other
+      (setf value (max value other-value))))
+  self)