Changeset 4010 for branches

Timestamp:

2016-05-31T12:11:19-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/monom.lisp

@@ -615 +615 @@
     (with-slots (exponents) 
         self
-      (cons '* 
-            (mapcan #'(lambda (var power) 
-                        (cond ((= power 0) nil)
-                              ((= power 1) (list var))
-                              (t (list `(expt ,var ,power)))))
-                    vars (coerce exponents 'list)))))
+      (let ((m (mapcan #'(lambda (var power) 
+                                 (cond ((= power 0) nil)
+                                       ((= power 1) (list var))
+                                       (t (list `(expt ,var ,power)))))
+                       vars (coerce exponents 'list))))
+        (cond ((endp (cdr m)) 
+               (car m))
+              (t 
+               (cons '* m))))))
   (:method ((self term) &optional vars)
     "Convert a term SELF to infix form, using variable VARS to build the representation."
@@ -628 +631 @@
       (let ((m (call-next-method)))
         (cond ((= coeff 1) m)
-              (t (setf (cdr m) (cons coeff (cdr m)))))
+              ((eql (car m) '*) 
+               (setf (cdr m) (cons coeff (cdr m))))
+              (t 
+               (list* '* coeff m)))
         m))))