Changeset 4054

Timestamp:

2016-05-31T18:02:22-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/division.lisp

@@ -66 +66 @@
 (defun check-loop-invariant (c f a fl r p
                              &aux 
-                               (p-zero (make-poly-zero))
+                               (p-zero 0)
                                (a (mapcar #'poly-reverse a))
                                (r (poly-reverse r)))
@@ -105 +105 @@
   (declare (type poly f) (list fl))
   ;; Loop invariant: c*f=sum ai*fi+r+p, where p must eventually become 0
-  (do ((r 0)
-       (c 1)
-       (a (make-list (length fl) :initial-element 0))
+  (do ((r (make-zero-for f))
+       (c (make-unit-for f))
+       (a (make-list (length fl) :initial-element (make-zero-for f)))
        (division-count 0)
        (p f))
@@ -203 +203 @@
                       (top-reduction-only $poly_top_reduction_only))
   #+grobner-check(when (null fl) (warn "normal-form: empty divisor list."))
-  (do ((r 0)
-       (c 1)
+  (do ((r (make-zero-for f))
+       (c (make-zero-for f))
        (division-count 0))
       ((or (universal-zerop f)
@@ -231 +231 @@
       (declare (ignore c))
       (subtract
-       (multiply cg (monom-times-poly mf f))
-       (multiply cf (monom-times-poly mg g))))))
+       (multiply cg (multiply mf f))
+       (multiply cf (multiply mg g))))))
 
 (defun buchberger-criterion (g)