|
From: Raymond T. <rt...@us...> - 2004-11-23 18:25:43
|
Update of /cvsroot/maxima/maxima/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20843/src Modified Files: rpart.lisp Log Message: Bug 808772: realpart returns expr with %I/FIX Apply the suggested better fix by removing the cond clause completely. Index: rpart.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/rpart.lisp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- rpart.lisp 23 Nov 2004 18:18:33 -0000 1.5 +++ rpart.lisp 23 Nov 2004 18:25:33 -0000 1.6 @@ -207,18 +207,14 @@ (risplit ((lambda ($numer) (exptrl ris pow)) t))) (t ((lambda (sp aa) ;;If all else fails, we use the trigonometric form. - (cond ((and (=0 (cdr sp)) - (=0 (cdr aa)) - (freeof '$%i l)) - (cons l 0)) - (t ((lambda (pre post) - (cons (mul pre (take '(%cos) post)) - (mul pre (take '(%sin) post)))) - (mul (powers '$%e (mul (cdr aa) (mul (cdr sp) -1))) - (powers (car aa) (car sp))) - (add (mul (cdr sp) (take '(%log) (car aa))) - (mul (car sp) (cdr aa))))))) - (risplit (caddr l)) (absarg1 (cadr l)))))) + ((lambda (pre post) + (cons (mul pre (take '(%cos) post)) + (mul pre (take '(%sin) post)))) + (mul (powers '$%e (mul (cdr aa) (mul (cdr sp) -1))) + (powers (car aa) (car sp))) + (add (mul (cdr sp) (take '(%log) (car aa))) + (mul (car sp) (cdr aa))))) + (risplit (caddr l)) (absarg1 (cadr l)))))) (caddr l) nil nil)) (defun risplit-noun (l) |