1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35
|
Description: import corrections from git master
Apply certain testsuite fixes from git master
Forwarded: not-needed
Author: Camm Maguire <camm@debian.org>
--- maxima-5.47.0.orig/share/contrib/Grobner/grobner.lisp
+++ maxima-5.47.0/share/contrib/Grobner/grobner.lisp
@@ -852,14 +852,14 @@ at the beginning of each monomial."
(make-poly-from-termlist (termlist-contract (poly-termlist p) k)
(poly-sugar p)))
-(declaim (ftype (function (poly &optional sequence)) poly-extend))
+(declaim (ftype (function (poly &optional sequence) poly) poly-extend))
(defun poly-extend (p &optional (m (make-monom 1 :initial-element 0)))
(make-poly-from-termlist
(termlist-extend (poly-termlist p) m)
(+ (poly-sugar p) (monom-sugar m))))
-(declaim (ftype (function (poly fixnum)) poly-add-variables))
+(declaim (ftype (function (poly fixnum) list) poly-add-variables))
(defun poly-add-variables (p k)
(setf (poly-termlist p) (termlist-add-variables (poly-termlist p) k))
--- maxima-5.47.0.orig/share/contrib/diffequations/lazysolver.lisp
+++ maxima-5.47.0/share/contrib/diffequations/lazysolver.lisp
@@ -70,7 +70,7 @@
($length eqs) ($length vars)))
(setq sol (cdr ($algsys eqs vars)))
- (setq sol (sort sol #'(lambda (a b) (< (my-expr-size a) (my-expr-size b)))))
+ (setq sol (stable-sort sol #'(lambda (a b) (< (my-expr-size a) (my-expr-size b)))))
(dolist (si sol)
(if ($checksolution si eqs nz) (return si)))))
|