Changeset 1252

Timestamp:

2015-06-11T15:36:13-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/division.lisp

@@ -77 +77 @@
          (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 f)
-      (reduce #'p-add
-              (list (inner-product a fl p-add p-mul p-zero)
-                    r
-                    p))))))
+    (let ((prod (inner-product a fl p-add p-mul p-zero)))
+      (poly-zerop
+       (p-sub
+        (scalar-times-poly ring c f)
+        (reduce #'p-add (list prod r p)))))))
   
 
@@ -114 +112 @@
        (values a r c division-count))
     (declare (fixnum division-count))
+    ;; Check the loop invariant here
+    (check-loop-invariant ring-and-order c f a fl r p)
     (do ((fl fl (rest fl))              ;scan list of divisors
          (b a (rest b)))
@@ -137 +137 @@
                 (push (make-term m c2) (poly-termlist (car b))))
               t))))
-      ;; Check the loop invariant here
-      (check-loop-invariant ring-and-order c f a fl r p)
       )))