Changeset 4089

Timestamp:

2016-06-01T09:36:24-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/division.lisp

@@ -110 +110 @@
        (setf a (mapcar #'poly-reverse a)
              r (poly-reverse r))
-       ;; Initialize the sugar of the quotients
-       ;; (mapc #'poly-reset-sugar a) ;; TODO: Sugar is currently unimplemented
        (values a r c division-count))
     (declare (fixnum division-count))
@@ -120 +118 @@
         ((cond
            ((endp fl)                           ;no division occurred
-            ;; TODO: 3 lines below implement sugar strategy (unimplemented in this version)
-            ;;(push (leading-term p) (poly-termlist r)) ;move lt(p) to remainder
-            ;;(setf (poly-sugar r) (max (poly-sugar r) (term-sugar (poly-lt p))))
-            ;;(pop (poly-termlist p))   ;remove lt(p) from p
             t)
            ((divides-p (leading-monomial (car fl)) (leading-monomial p)) ;division occurred
@@ -138 +132 @@
                       c (multiply c c1)
                       p (grobner-op c2 c1 m p (car fl)))
-                (push (change-class m 'term :coeff c2)
-                      (poly-termlist (car b))))
+                (setf (car b) (add (car b)
+                                   (change-class m 'term :coeff c2))))
               t))))
       )))