close Warning: Can't synchronize with repository "(default)" (The repository directory has changed, you should resynchronize the repository with: trac-admin $ENV repository resync '(default)'). Look in the Trac log for more information.

Changeset 2563


Ignore:
Timestamp:
2015-06-19T16:31:17-07:00 (9 years ago)
Author:
Marek Rychlik
Message:

* empty log message *

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/f4grobner/polynomial.lisp

    r2562 r2563  
    115115            ((endp p)
    116116             ;; Include remaining terms of termlist1
    117              (setf termlist1 (nconc termlist1 q)))
     117             (setf termlist1 (nconc p q)))
    118118          ;; Copy all initial terms of q greater than (lt p) into p       
    119119          (do ((r q (cdr q)))
    … …  
    123123                  (multiple-value-bind
    124124                        (greater-p equal-p)
    125                       (lex> (lt p) (lt r))
    126                     (when (and (not (greater-p)) equal-p)
    127                       (setf (lc p) (add-to (lc p) (lc q))))
    128                     greater-p))))
    129             (push (pop r) p))))))
     125                      (lex> (lt r) (lt p))
     126                    (cond
     127                      (greater-p
     128                       (push (pop r) p))
     129                      (equal-p
     130                       (setf (lc p) (add-to (lc p) (lc q)))))
     131                    (not greater-p))))))))))
    130132  self)
    131133
Note: See TracChangeset for help on using the changeset viewer.