Changeset 1242

Timestamp:

2015-06-11T15:05:51-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/division.lisp

@@ -64 +64 @@
             (scalar-times-poly-1 ring c1 (monom-times-poly m g))))
 
-(defun check-loop-invariant (ring-and-order c f0 a fl r p
+(defun check-loop-invariant (ring-and-order c f a fl r p
                              &aux 
                                (ring (ro-ring ring-and-order))
@@ -70 +70 @@
   "Check loop invariant of division algorithms, when we divide a
 polynomial F by the list of polynomials FL. The invariant is the
-identity C*F0=SUM AI*FI+R+F, where F0 is the initial value of F, A is
+identity C*F=SUM AI*FI+R+P, where F0 is the initial value of F, A is
 the list of partial quotients, R is the intermediate value of the
-remainder, and F is the intermediate value which eventually becomes
+remainder, and P is the intermediate value which eventually becomes
 0."
-  (flet ((p-add (p q) (poly-add ring-and-order p q))
-         (p-sub (p q) (poly-sub ring-and-order p q))
-         (p-mul (p q) (poly-mul ring-and-order p q)))
+  (flet ((p-add (x y) (poly-add ring-and-order x y))
+         (p-sub (x y) (poly-sub ring-and-order x y))
+         (p-mul (x y) (poly-mul ring-and-order x y)))
     (poly-zerop
      (p-sub
-      (scalar-times-poly ring c f0)
+      (scalar-times-poly ring c f)
       (reduce #'p-add
               (list (inner-product a fl p-add p-mul p-zero)