Changeset 4530 for branches

Timestamp:

2016-06-17T18:45:17-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/polynomial-sugar.lisp

@@ -32 +32 @@
            "ADD-TO"
            "MULTIPLY-BY"
+           "MAKE-UNIT-FOR"
            )
   (:documentation "Implements 'sugar'."))
@@ -48 +49 @@
   (:method ((object poly))
     "Static sugar of a poly OBJECT is the maximum sugar of its terms."
-  (with-slots (termlist)
+  (with-accessors ((termlist poly-termlist))
         object
       (loop for trm in termlist maximize (static-sugar trm)))))
@@ -68 +69 @@
   "Initialize sugar value based on the exponents."
   (declare (ignore slot-names initargs))
-  (setf (slot-value self 'value) (static-sugar self)))
+  (with-slots (value) 
+      self
+    (setf value (static-sugar self))))
 
 (defmethod update-instance-for-different-class :after ((old monom) (new monom-with-sugar) &key)
@@ -102 +105 @@
 (defmethod shared-initialize :after ((self term-with-sugar) slot-names &rest initargs &key)
   (declare (ignore slot-names initargs))
-  (setf (slot-value self 'value) (static-sugar self)))
+  (with-slots (value)
+      self
+    (setf value (static-sugar self))))
 
 
@@ -124 +129 @@
   "Initialize sugar to its static value, which is the maximum of sugar values of the terms."
   (declare (ignore slot-names initargs))
-  (setf (slot-value self 'value) (static-sugar self)))
+    (setf (slot-value self 'value) (static-sugar self)))
 
 (defmethod update-instance-for-different-class :after ((old poly) (new poly-with-sugar) &key)
@@ -162 +167 @@
       (setf value (max value other-value))))
   self)
+
+(defmethod make-unit-for ((object poly-with-sugar))
+  (change-class (call-next-method) 'poly-with-sugar))