Changeset 3446

Timestamp:

2015-09-05T09:24:58-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/monom.lisp

@@ -21 +21 @@
 
 (defpackage "MONOM"
-  (:use :cl)
+  (:use :cl :copy)
   (:export "MONOM"
            "EXPONENT"
@@ -158 +158 @@
 
 
-(defmethod monom-sugar (m &aux (start 0) (end (monom-dimension m)))
-  "Return the sugar of a monomial M. Optinally, a range
-of variables may be specified with arguments START and END."
-  (declare (type fixnum start end))
-  (monom-total-degree m start end))
-
-(defmethod monom-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)
-
-(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 monom-copy-instance ((object monom)  &rest initargs &key &allow-other-keys)
-  "An :AROUNT method for COPY-INSTANCE. The primary method is a shallow copy,
-  while for monomials we typically need a fresh copy of the
-  exponents."
-  (declare (ignore object initargs))
-  (let ((copy (call-next-method)))
-    (setf (monom-exponents copy) (copy-seq (monom-exponents copy)))
-    copy))
+(defmethod monom-sugar (m &optional start end)
+  (:documentation "Return the sugar of a monomial M. Optinally, a range
+of variables may be specified with arguments START and END.")
+  (:method ((m monom)  &optional (start 0) (end (monom-dimension m)))
+    (declare (type fixnum start end))
+    (monom-total-degree m start end)))
+
+(defgeneric monom-multiply-by (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))
+
+(defgeneric divide-by (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))
+
+(defgeneric monom-copy-instance (object &rest initargs &key &allow-other-keys)
+  (:documentation "Returns a deep copy of OBJECT.")
+  (:method ((object monom)  &rest initargs &key &allow-other-keys)
+    (declare (ignore object initargs))
+    (let ((copy (call-next-method)))
+      (setf (monom-exponents copy) (copy-seq (monom-exponents copy)))
+      copy)))
 
 (defmethod monom-multiply-2 ((m1 monom) (m2 monom))