Changeset 4240 for branches

Timestamp:

2016-06-04T19:41:09-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/monom.lisp

@@ -179 +179 @@
     (total-degree m start end)))
 
-(defgeneric multiply-by (self other)
-  (:documentation "Multiply SELF by OTHER, return SELF. The object SELF
-may be destructively modified in the process, while OTHER should remain
-unmodified.")
-  (:method ((self number) (other number)) (* self other))
-  (:method ((self monom) (other monom))
-    (with-slots ((exponents1 exponents))
-        self
-      (with-slots ((exponents2 exponents))
-          other
-        (unless (= (length exponents1) (length exponents2))
-          (error "Incompatible dimensions"))
-        (map-into exponents1 #'+ exponents1 exponents2)))
-    self))
+(defmethod multiply-by ((self monom) (other monom))
+  (with-slots ((exponents1 exponents))
+      self
+    (with-slots ((exponents2 exponents))
+        other
+      (unless (= (length exponents1) (length exponents2))
+        (error "Incompatible dimensions"))
+      (map-into exponents1 #'+ exponents1 exponents2)))
+  self)
 
 (defun multiply (factor &rest more-factors)
@@ -200 +195 @@
   (reduce #'multiply-by more-factors :initial-value (copy-instance factor)))
 
-(defgeneric divide-by (self other)
-  (:documentation "Divide SELF by OTHER, return SELF.")
-  (:method ((self number) (other number)) (/ self other))
-  (:method ((self monom) (other monom))
-    (with-slots ((exponents1 exponents))
-        self
-      (with-slots ((exponents2 exponents))
-          other
-        (unless (= (length exponents1) (length exponents2))
-          (error "divide-by: Incompatible dimensions."))
-        (unless (every #'>= exponents1 exponents2)
-          (error "divide-by: Negative power would result."))
-        (map-into exponents1 #'- exponents1 exponents2)))
-  self))
+(defmethod divide-by ((self monom) (other monom))
+  (with-slots ((exponents1 exponents))
+      self
+    (with-slots ((exponents2 exponents))
+        other
+      (unless (= (length exponents1) (length exponents2))
+        (error "divide-by: Incompatible dimensions."))
+      (unless (every #'>= exponents1 exponents2)
+        (error "divide-by: Negative power would result."))
+      (map-into exponents1 #'- exponents1 exponents2)))
+  self)
 
 (defmethod copy-instance :around ((object monom)  &rest initargs &key &allow-other-keys)
@@ -222 +214 @@
     copy))
 
-(defgeneric unary-inverse (self)
-  (:documentation "Returns the unary inverse of SELF.")
-  (:method ((self number)) (/ self))
-  (:method :before ((self monom))
-           (assert (zerop (total-degree self))
-                   nil
-                   "Monom ~A must have total degree 0 to be invertible." self))
-  (:method ((self monom)) self))
+(defmethod unary-inverse :before ((self monom))
+  (assert (zerop (total-degree self))
+          nil
+          "Monom ~A must have total degree 0 to be invertible.")
+  self)
+
+(defmethod unary-inverse ((self monom)) self)
 
 (defun divide (numerator &rest denominators)
@@ -540 +531 @@
 and powers of some variables, such as 5*X^2*Y^3."))
 
-(defmethod initialize-instance :around ((self term) &rest initargs &key coeff)
+(defmethod initialize-instance :around ((self term) &rest initargs &key (coeff 1))
   "A convenience method. If a coefficient is an integer, wrap it in the INTEGER-RING object"
   ;; Dispatch on supplied type of coefficient
@@ -549 +540 @@
   (apply #'call-next-method (cons self initargs)))
   
-(defmethod update-instance-for-different-class :after ((old monom) (new term) &key (coeff 1))
+(defmethod update-instance-for-different-class :after ((old monom) (new term) &key coeff)
   "Converts OLD of class MONOM to a NEW of class TERM, initializing coefficient to COEFF."
   (reinitialize-instance new :coeff coeff))
@@ -608 +599 @@
   (setf (term-coeff self) (divide-by (term-coeff self) (term-coeff other))))
 
-(defgeneric unary-minus (self) 
-  (:documentation "Negate object SELF and return it.")
-  (:method ((self number)) (- self))
-  (:method ((self term))
-    (setf (term-coeff self) (unary-minus (term-coeff self)))
-    self))
+(defmethod unary-minus ((self term))
+  (setf (term-coeff self) (unary-minus (term-coeff self)))
+  self)
 
 (defgeneric universal-zerop (self)