Changeset 868 for branches/f4grobner

Timestamp:

2015-06-09T11:46:13-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/monomial.lisp (modified) (1 diff)

branches/f4grobner/monomial.lisp

@@ -174 +174 @@
 (defun monom-rel-prime-p (m1 m2)
   "Returns T if two monomials M1 and M2 are relatively prime (disjoint)."
-  (declare (type monom m1 m2))
-  (every #'(lambda (x y) (declare (type exponent x y)) (zerop (min x y))) 
-         (monom-exponents m1)
-         (monom-exponents m2)))
+  (every #'(lambda (x y) (declare (type exponent x y)) (zerop (min x y))) m1 m2))
 
 (defun monom-equal-p (m1 m2)
   "Returns T if two monomials M1 and M2 are equal."
-  (declare (type monom m1 m2))
   (every #'= (monom-exponents m1) (monom-exponents m2)))
 
-(defun monom-lcm (m1 m2 &aux (result (copy-structure m1)))
+(defun monom-lcm (m1 m2 &aux (result (copy-sequence m1)))
   "Returns least common multiple of monomials M1 and M2."
-  (declare (type monom m1 m2))
-  (map-into (monom-exponents result) #'max 
-            (monom-exponents m1)
-            (monom-exponents m2))
-  result)
-
-(defun monom-gcd (m1 m2 &aux (result (copy-structure m1)))
+  (map-into result #'max m1 m2))
+
+(defun monom-gcd (m1 m2 &aux (result (copy-sequence m1)))
   "Returns greatest common divisor of monomials M1 and M2."
-  (declare (type monom m1 m2))
-  (map-into (monom-exponents result) #'min (monom-exponents m1) (monom-exponents m2))
-  result)
+  (map-into result #'min m1 m2))
 
 (defun monom-depends-p (m k)
   "Return T if the monomial M depends on variable number K."
-  (declare (type monom m) (fixnum k))
   (plusp (monom-elt m k)))
 
-(defmacro monom-map (fun m &rest ml &aux (result `(copy-structure ,m)))
-  `(map-into (monom-exponents ,result) ,fun (monom-exponents ,m) ,@ml))
+(defmacro monom-map (fun m &rest ml &aux (result `(copy-sequence ,m)))
+  `(map-into ,result ,fun ,m ,@ml))
 
 (defmacro monom-append (m1 m2)
-  `(make-monom :exponents (concatenate 'vector (monom-exponents ,m1) (monom-exponents ,m2))))
+  `(concatenate 'vector ,m1 ,m2))
 
 (defmacro monom-contract (k m)
-  `(setf (monom-exponents ,m) (subseq (monom-exponents ,m) ,k)))
+  `(setf ,m (subseq ,m ,k)))