Changeset 4235

Timestamp:

2016-06-04T19:01:11-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/monom.lisp

@@ -144 +144 @@
     (length (monom-exponents self))))
 
-(defgeneric universal-equalp (object1 object2)
-  (:method ((m1 monom) (m2 monom))
-    "Returns T iff monomials M1 and M2 have identical EXPONENTS."
-    (equalp (monom-exponents m1) (monom-exponents m2))))
+(defmethod universal-equalp ((self monom) (other monom))
+    "Returns T iff monomials SELF and OTHER have identical EXPONENTS."
+  (equalp (monom-exponents self) (monom-exponents other))))
 
 (defgeneric monom-elt (m index)
@@ -657 +656 @@
     (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)))
+      (let ((monom-sexp (call-next-method))
+            (coeff-sexp (->sexp coeff)))
+        (cond ((eql coeff-sexp 1) monom-sexp)
+              ((atom monom-sexp) 
+               (cond ((eql monom-sexp 1) coeff-sexp)
+                     (t (list '* coeff-sexp monom-sexp))))
+              ((eql (car monom-sexp) '*) 
+               (list* '* coeff-sexp (cdr monom-sexp)))
               (t 
-               (list '* coeff sexp)))))))
+               (list '* coeff-sexp monom-sexp)))))))