Changeset 4168

Timestamp:

2016-06-03T02:01:04-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/monom.lisp (modified) (2 diffs)

branches/f4grobner/monom.lisp

@@ -625 +625 @@
     (cons (coerce (monom-exponents self) 'list) (term-coeff self))))
 
-(defgeneric ->sexp (self &optional vars)
-  (:documentation "Convert a polynomial SELF to an S-expression, using variables VARS.")
-  (:method :before ((self monom) &optional vars)
-           "Check the length of variables VARS against the length of exponents in SELF."
+(defgeneric ->sexp (object &optional vars)
+  (:documentation "Convert a polynomial OBJECT to an S-expression, using variables VARS.")
+  (:method :before ((object monom) &optional vars)
+           "Check the length of variables VARS against the length of exponents in OBJECT."
            (with-slots (exponents)
-               self
+               object
              (assert (= (length vars) (length exponents))
                      nil
                      "Variables ~A and exponents ~A must have the same length." vars exponents)))
-  (:method ((self monom) &optional vars)
-    "Convert a monomial SELF to infix form, using variable VARS to build the representation."
+  (:method ((object monom) &optional vars)
+    "Convert a monomial OBJECT to infix form, using variable VARS to build the representation."
     (with-slots (exponents) 
-        self
+        object
       (let ((m (mapcan #'(lambda (var power) 
                                  (cond ((= power 0) nil)
@@ -647 +647 @@
               (t 
                (cons '* m))))))
-  (:method ((self term) &optional vars)
-    "Convert a term SELF to infix form, using variable VARS to build the representation."
+  (:method :around ((object term) &optional vars)
+    "Convert a term OBJECT to infix form, using variable VARS to build the representation."
     (declare (ignore vars))
-    (with-slots (exponents coeff) 
-        self
-      (let ((m (call-next-method)))
-        (cond ((eql coeff 1) m)
-              ((atom m) 
-               (cond ((eql m 1) coeff)
-                     (t (list '* coeff m))))
-              ((eql (car m) '*) 
-               (list* '* coeff (cdr m)))
+    (with-slots (coeff) 
+        object
+      (let ((sexp (call-next-method)))
+        (cond ((eql coeff 1) sexp)
+              ((atom sexp) 
+               (cond ((eql sexp 1) coeff)
+                     (t (list '* coeff sexp))))
+              ((eql (car sexp) '*) 
+               (list* '* coeff (cdr sexp)))
               (t 
-               (list '* coeff m)))))))
+               (list '* coeff sexp)))))))