Changeset 2171 for branches

Timestamp:

2015-06-17T22:13:13-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/monom.lisp

@@ -175 +175 @@
 (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)
-      m1
-    (with-slots (exponents2 exponents)
-        m2
-      (with-slots (exponents3 exponents)
+  (with-slots ((exponents1 exponents))
+      m1
+    (with-slots ((exponents2 exponents))
+        m2
+      (with-slots ((exponents3 exponents))
           m3
-        (with-slots (exponents4 exponents)
+        (with-slots ((exponents4 exponents))
             m4
           (every 
@@ -189 +189 @@
 (defmethod r-divisible-by-p ((m1 monom) (m2 monom))
   "Returns T if monomial M1 is divisible by monomial M2, NIL otherwise."
-  (with-slots (exponents1 exponents)
-      m1
-    (with-slots (exponents2 exponents)
+  (with-slots ((exponents1 exponents))
+      m1
+    (with-slots ((exponents2 exponents))
         m2
       (every #'>= exponents1 exponents2))))
@@ -197 +197 @@
 (defmethod r-rel-prime-p ((m1 monom) (m2 monom))
   "Returns T if two monomials M1 and M2 are relatively prime (disjoint)."
-  (with-slots (exponents1 exponents)
-      m1
-    (with-slots (exponents2 exponents)
+  (with-slots ((exponents1 exponents))
+      m1
+    (with-slots ((exponents2 exponents))
         m2
       (every #'(lambda (x y) (zerop (min x y))) exponents1 exponents2))))
@@ -206 +206 @@
 (defmethod r-equalp ((m1 monom) (m2 monom))
   "Returns T if two monomials M1 and M2 are equal."
-  (with-slots (exponents1 exponents)
-      m1
-    (with-slots (exponents2 exponents)
+  (with-slots ((exponents1 exponents))
+      m1
+    (with-slots ((exponents2 exponents))
         m2
       (every #'= exponents1 exponents2))))
@@ -214 +214 @@
 (defmethod r-lcm ((m1 monom) (m2 monom)) 
   "Returns least common multiple of monomials M1 and M2."
-  (with-slots (exponents1 exponents)
-      m1
-    (with-slots (exponents2 exponents)
+  (with-slots ((exponents1 exponents))
+      m1
+    (with-slots ((exponents2 exponents))
         m2
       (let* ((exponents (copy-seq exponents1))
@@ -226 +226 @@
 (defmethod r-gcd ((m1 monom) (m2 monom))
   "Returns greatest common divisor of monomials M1 and M2."
-  (with-slots (exponents1 exponents)
-      m1
-    (with-slots (exponents2 exponents)
+  (with-slots ((exponents1 exponents))
+      m1
+    (with-slots ((exponents2 exponents))
         m2
       (let* ((exponents (copy-seq exponents1))
@@ -245 +245 @@
                              &aux (dim (+ (r-dimension m1) (r-dimension m2))))
   (declare (fixnum dim))
-  (with-slots (exponents1 exponents)
-      m1
-    (with-slots (exponents2 exponents)
+  (with-slots ((exponents1 exponents))
+      m1
+    (with-slots ((exponents2 exponents))
         m2
       (make-instance 'monom