Changeset 4048 for branches

Timestamp:

2016-05-31T17:09:58-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/division.lisp (modified) (2 diffs)

branches/f4grobner/division.lisp

@@ -45 +45 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defun grobner-op (ring-and-order c1 c2 m f g
-                   &aux 
-                     (ring (ro-ring ring-and-order)))
+(defun grobner-op (c1 c2 m f g)
   "Returns C2*F-C1*M*G, where F and G are polynomials M is a monomial.
 Assume that the leading terms will cancel."
@@ -53 +51 @@
            (type monom m)
            (type poly f g))
-  #+grobner-check(funcall (ring-zerop ring)
-                          (funcall (ring-sub ring)
-                                   (funcall (ring-mul ring) c2 (poly-lc f))
-                                   (funcall (ring-mul ring) c1 (poly-lc g))))
+  #+grobner-check(universal-zerop
+                  (subtract
+                   (multiply c2 (leading-coefficient f))
+                   (multiply c1 (leading-coefficient g))))
   #+grobner-check(monom-equal-p (poly-lm f) (monom-mul m (poly-lm g)))
   ;; Note that below we can drop the leading terms of f ang g for the