Changeset 2055 for branches

Timestamp:

2015-06-17T18:51:01-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/monom.lisp

@@ -132 +132 @@
     (setf (elt exponents index) new-value)))
 
-(defmethod ring-total-degree ((m monom) &optional (start 0) (end (dimension m)))
+(defmethod total-degree ((m monom) &optional (start 0) (end (dimension m)))
   "Return the todal degree of a monomoal M. Optinally, a range
 of variables may be specified with arguments START and END."
@@ -146 +146 @@
   (monom-total-degree m start end))
 
-(defmethod monom-mul ((m1 monom) (m2 monom))  &aux (result (copy-seq m1)))
+(defmethod mul ((m1 monom) (m2 monom))  &aux (result (copy-seq m1)))
 "Multiply monomial M1 by monomial M2."
   (with-slots ((exponents1 exponents))
@@ -157 +157 @@
         (make-instance 'monom :dim dim :exponents exponents)))))
 
-(defmethod monom-div ((m1 monom) (m2 monom))
+(defmethod div ((m1 monom) (m2 monom))
   "Divide monomial M1 by monomial M2."
   (with-slots ((exponents1 exponents))
@@ -168 +168 @@
         (make-instance 'monom :dim dim :exponents exponents)))))
 
-(defmethod monom-divides-p ((m1 monom) (m2 monom))
+(defmethod divides-p ((m1 monom) (m2 monom))
   "Returns T if monomial M1 divides monomial M2, NIL otherwise."
   (with-slots ((exponents1 exponents))
@@ -176 +176 @@
       (every #'<= exponents1 exponents2))))
 
-#|
-
-(defun monom-divides-monom-lcm-p (m1 m2 m3)
-  "Returns T if monomial M1 divides MONOM-LCM(M2,M3), NIL otherwise."
-  (declare (type monom m1 m2 m3))
+(defmethod divides-lcm-p ((m1 monom) (m2 monom) (m3 monom))
+  "Returns T if monomial M1 divides LCM(M2,M3), NIL otherwise."
   (every #'(lambda (x y z) (<= x (max y z))) 
          m1 m2 m3))
-