Changeset 2144

Timestamp:

2015-06-17T21:29:08-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/monom.lisp

@@ -115 +115 @@
     (setf (cl:elt exponents index) new-value)))
 
-(defmethod total-degree ((m monom) &optional (start 0) (end (dimension m)))
+(defmethod r-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."
@@ -124 +124 @@
 
 
-(defmethod sugar ((m monom) &aux (start 0) (end (dimension m)))
+(defmethod r-sugar ((m monom) &aux (start 0) (end (dimension m)))
   "Return the sugar of a monomial M. Optinally, a range
 of variables may be specified with arguments START and END."
@@ -132 +132 @@
     (total-degree exponents start end)))
 
-(defmethod + ((m1 monom) (m2 monom))
+(defmethod r* ((m1 monom) (m2 monom))
   "Multiply monomial M1 by monomial M2."
   (with-slots ((exponents1 exponents))
@@ -145 +145 @@
 
 
-(defmethod / ((m1 monom) (m2 monom))
+(defmethod r/ ((m1 monom) (m2 monom))
   "Divide monomial M1 by monomial M2."
   (with-slots ((exponents1 exponents))
@@ -156 +156 @@
         (make-instance 'monom :dim dim :exponents exponents)))))
 
-(defmethod divides-p ((m1 monom) (m2 monom))
+(defmethod r-divides-p ((m1 monom) (m2 monom))
   "Returns T if monomial M1 divides monomial M2, NIL otherwise."
   (with-slots ((exponents1 exponents))
@@ -165 +165 @@
 
 
-(defmethod divides-lcm-p ((m1 monom) (m2 monom) (m3 monom))
+(defmethod r-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))) 
@@ -171 +171 @@
 
 
-(defmethod lcm-divides-lcm-p ((m1 monom) (m2 monom) (m3 monom) (m4 monom))
+(defmethod r-lcm-divides-lcm-p ((m1 monom) (m2 monom) (m3 monom) (m4 monom))
   "Returns T if monomial MONOM-LCM(M1,M2) divides MONOM-LCM(M3,M4), NIL otherwise."
   (declare (type monom m1 m2 m3 m4))
@@ -177 +177 @@
          m1 m2 m3 m4))
          
-(defmethod lcm-equal-lcm-p (m1 m2 m3 m4)
+(defmethod r-lcm-equal-lcm-p (m1 m2 m3 m4)
   "Returns T if monomial LCM(M1,M2) equals LCM(M3,M4), NIL otherwise."
   (with-slots (exponents1 exponents)
@@ -191 +191 @@
            exponents1 exponents2 exponents3 exponents4))))))
 
-(defmethod divisible-by-p ((m1 monom) (m2 monom))
+(defmethod r-divisible-by-p ((m1 monom) (m2 monom))
   "Returns T if monomial M1 is divisible by monomial M2, NIL otherwise."
-
-  (every #'>= m1 m2))
+  (with-slots (exponents1 exponents)
+      m1
+    (with-slots (exponents2 exponents)
+        m2
+      (every #'>= exponents1 exponents2))))
 
 (defmethod rel-prime-p ((m1 monom) (m2 monom))