Changeset 2063

Timestamp:

2015-06-17T19:00:41-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/monom.lisp

@@ -144 +144 @@
 of variables may be specified with arguments START and END."
   (declare (type fixnum start end))
-  (monom-total-degree m start end))
-
-(defmethod mul ((m1 monom) (m2 monom))  &aux (result (copy-seq m1)))
+  (total-degree m start end))
+
+(defmethod ring-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 div ((m1 monom) (m2 monom))
+(defmethod ring-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 divides-p ((m1 monom) (m2 monom))
   "Returns T if monomial M1 divides monomial M2, NIL otherwise."
@@ -176 +177 @@
       (every #'<= exponents1 exponents2))))
 
+
+
 (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))
+
+