From: Dieter K. <cra...@us...> - 2011-11-14 22:21:24
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Maxima, A Computer Algebra System". The branch, master has been updated via 657cf51f1b6bf694666c37250f6f5de823e3addc (commit) via d19500aa197c7569e3f44150d0ff925e4a764420 (commit) via 5d411da17d03d1a7a650f7f5ebd70e320d95a3dd (commit) from 3d37105604192bd83eca92229bb75faeb014235e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 657cf51f1b6bf694666c37250f6f5de823e3addc Author: crategus <cra...@us...> Date: Mon Nov 14 23:17:39 2011 +0100 In plusin make a mplus expression to guarantee that x1 is added again into the sum. Related bug report: ID: 3437268 expand doesn't fully expand One result in rtest15.mac has changed, but it is equivalent. diff --git a/src/simp.lisp b/src/simp.lisp index 650b31a..8bf5dab 100644 --- a/src/simp.lisp +++ b/src/simp.lisp @@ -1319,6 +1319,8 @@ equt ;; Call muln to get a simplified product. (setq x1 (muln (cons (addk w (if flag (cadadr fm) 1)) x) t)) + ;; Make a mplus expression to guarantee that x1 is added again into the sum + (setq x1 (list '(mplus) x1)) equt2 (rplaca (cdr fm) (if (zerop1 x1) commit d19500aa197c7569e3f44150d0ff925e4a764420 Author: crategus <cra...@us...> Date: Mon Nov 14 23:14:02 2011 +0100 Adding examples related to the bug report ID: 3437268: expand doesn't fully expand. diff --git a/tests/rtest16.mac b/tests/rtest16.mac index 18483b9..235ca28 100644 --- a/tests/rtest16.mac +++ b/tests/rtest16.mac @@ -2093,9 +2093,10 @@ divide(p, (z-2-sqrt(2)*%i),z); 2^(3/5+x)+2^(-2/5+x); 3*2^(x-2/5); -/* Bug ID: 1439566 - zerobern & bernpoly +/* ----------------------------------------------------------------------------- + * Bug ID: 1439566 - zerobern & bernpoly * Show that the option variable zerobern does not change the results. - */ + * -------------------------------------------------------------------------- */ zerobern:false; false; bernpoly(x,3); @@ -2160,3 +2161,15 @@ done$ 14*sqrt(5)+2*3^(5/2)$ 5*sqrt(5)+5*sqrt(3)+2*sqrt(75)+2*sqrt(45)+3*sqrt(5)+3*sqrt(3); 14*sqrt(5)+2*3^(5/2)$ + +/* ----------------------------------------------------------------------------- + * Bug ID 3437268: expand doesn't fully expand + * Check the expected results after revision 14.11.2011 of simp.lisp. + * -------------------------------------------------------------------------- */ +-3*a/sqrt(2)+sqrt(2)*a+a/sqrt(2); +0$ +expand(-(atan((sqrt(2)*sin(8))/cos(8))+3*%pi)/sqrt(2) + +atan((sqrt(2)*sin(8))/cos(8))/sqrt(2) + +sqrt(2)*%pi + +%pi/sqrt(2)); +0$ commit 5d411da17d03d1a7a650f7f5ebd70e320d95a3dd Author: crategus <cra...@us...> Date: Mon Nov 14 23:12:13 2011 +0100 Correcting one example: Because of a change in simp.lisp revision 14.11.2011 the result has changed, but it is equivalent. diff --git a/tests/rtest15.mac b/tests/rtest15.mac index ea1f0d1..6e7d5bb 100644 --- a/tests/rtest15.mac +++ b/tests/rtest15.mac @@ -618,7 +618,11 @@ ratsimp(ev(logcontract((integrate(1/(x^8-1),x,0,1/2))),algebraic) + * */ integrate(t^2*log(t)/((t^2-1)*(t^4+1)), t, 0, 1); --((sqrt(2)-2)*%pi^2/32); +/* The following result has changed to an equivalent result, + * because of a change in simp.lisp revision 14.11.2011. + * -((sqrt(2)-2)*%pi^2/32); + */ +(sqrt(2)-1)*%pi^2/2^(9/2)$ /* * Bug [ 1073338 ] integrate yields incorrect result on rational function ----------------------------------------------------------------------- Summary of changes: src/simp.lisp | 2 ++ tests/rtest15.mac | 6 +++++- tests/rtest16.mac | 17 +++++++++++++++-- 3 files changed, 22 insertions(+), 3 deletions(-) hooks/post-receive -- Maxima, A Computer Algebra System |