Changeset 4241 for branches

Timestamp:

2016-06-04T19:45:29-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/monom.lisp

@@ -526 +526 @@
 
 (defclass term (monom)
-  ((coeff :initarg :coeff :accessor term-coeff :type ring))
+  ((coeff :initarg :coeff :initform 1 :accessor term-coeff :type ring))
   (:default-initargs :coeff 1)
   (:documentation "Implements a term, i.e. a product of a scalar
@@ -603 +603 @@
   self)
 
-(defgeneric universal-zerop (self) 
-  (:documentation "Return T iff SELF is zero.")
-  (:method ((self number)) (zerop self))
-  (:method ((self term))
-    (universal-zerop (term-coeff self))))
+(defmethod universal-zerop ((self term))
+  (universal-zerop (term-coeff self)))
 
 (defgeneric ->list (self)
@@ -617 +614 @@
     (cons (coerce (monom-exponents self) 'list) (->sexp (term-coeff 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)
-               object
-             (assert (= (length vars) (length exponents))
-                     nil
-                     "Variables ~A and exponents ~A must have the same length." vars exponents)))
-  (:method ((object monom) &optional vars)
-    "Convert a monomial OBJECT to infix form, using variable VARS to build the representation."
+(defmethod ->sexp :before ((object monom) &optional vars)
+  "Check the length of variables VARS against the length of exponents in OBJECT."
+  (with-slots (exponents)
+      object
+    (assert (= (length vars) (length exponents))
+            nil
+            "Variables ~A and exponents ~A must have the same length." vars exponents)))
+
+(defmethod ->sexp ((object monom) &optional vars)
+  "Convert a monomial OBJECT to infix form, using variable VARS to build the representation."
     (with-slots (exponents) 
         object
@@ -639 +635 @@
               (t 
                (cons '* m))))))
-  (: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 (coeff) 
-        object
-      (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 monom-sexp)))))))
+
+(defmethod ->sexp :around ((object term) &optional vars)
+  "Convert a term OBJECT to infix form, using variable VARS to build the representation."
+  (declare (ignore vars))
+  (with-slots (coeff) 
+      object
+    (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 monom-sexp))))))