Changeset 1176 for branches

Timestamp:

2015-06-10T20:33:30-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/division.lisp

@@ -44 +44 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defun grobner-op (ring c1 c2 m f g)
+(defun grobner-op (ring-and-order c1 c2 m f g
+                   &aux 
+                     (ring (ro-ring ring-and-order)))
   "Returns C2*F-C1*M*G, where F and G are polynomials M is a monomial.
 Assume that the leading terms will cancel."
@@ -53 +55 @@
   #+grobner-check(monom-equal-p (poly-lm f) (monom-mul m (poly-lm g)))
   ;; Note that we can drop the leading terms of f ang g
-  (poly-sub ring
+  (poly-sub ring-and-order
             (scalar-times-poly-1 ring c2 f)
             (scalar-times-poly-1 ring c1 (monom-times-poly m g))))
@@ -182 +184 @@
 case in rings which are not fields. The exact division operator
 is assumed to be provided by the RING structure of the
-COEFFICIENT-RING package."
+lCOEFFICIENT-RING package."
   (mapc #'(lambda (term)
             (setf (term-coeff term) (funcall (ring-div ring) (term-coeff term) c)))