From: Raymond T. <rt...@us...> - 2009-02-27 17:55:12
|
Update of /cvsroot/maxima/maxima/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv25019 Modified Files: ellipt.lisp Log Message: Use float-numerical-eval-p and friends in more places. Index: ellipt.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/ellipt.lisp,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- ellipt.lisp 27 Feb 2009 17:33:40 -0000 1.55 +++ ellipt.lisp 27 Feb 2009 17:55:04 -0000 1.56 @@ -943,14 +943,12 @@ (twoargcheck form) (let ((u (simpcheck (cadr form) z)) (m (simpcheck (caddr form) z))) - (cond ((or (and (floatp u) (floatp m)) - (and $numer (numberp u) (numberp m))) + (cond ((float-numerical-eval-p u m) ;; Numerically evaluate asn ;; ;; asn(x,m) = F(asin(x),m) (complexify (elliptic-f (cl:asin (float u)) m))) - ((and $numer (complex-number-p u) - (complex-number-p m)) + ((complex-float-numerical-eval-p u m) (complexify (elliptic-f (cl:asin (complex ($realpart u) ($imagpart u))) (complex ($realpart m) ($imagpart m))))) ((or (bigfloat-numerical-eval-p u m) @@ -1020,16 +1018,14 @@ (twoargcheck form) (let ((u (simpcheck (cadr form) z)) (m (simpcheck (caddr form) z))) - (cond ((or (and (floatp u) (floatp m)) - (and $numer (numberp u) (numberp m))) + (cond ((float-numerical-eval-p u m) ;; Numerically evaluate adn (let* ((u (float u)) (m (float m)) (phi (/ (* (sqrt (- 1 u)) (sqrt (+ 1 u))) (sqrt m)))) (complexify (elliptic-f (cl:asin phi) m)))) - ((and $numer (complex-number-p u) - (complex-number-p m)) + ((complex-float-numerical-eval-p u m) (let* ((u (complex ($realpart u) ($imagpart u))) (phi (/ (* (sqrt (- 1 u)) (sqrt (+ 1 u))) (sqrt m)))) @@ -1731,12 +1727,10 @@ (twoargcheck form) (let ((phi (simpcheck (cadr form) z)) (m (simpcheck (caddr form) z))) - (cond ((or (and (floatp phi) (floatp m)) - (and $numer (numberp phi) (numberp m))) + (cond ((float-numerical-eval-p phi m) ;; Numerically evaluate it (elliptic-f (float phi) (float m))) - ((and $numer (complex-number-p phi) - (complex-number-p m)) + ((complex-float-numerical-eval-p phi m) (complexify (elliptic-f (complex ($realpart phi) ($imagpart phi)) (complex ($realpart m) ($imagpart m))))) ((or (bigfloat-numerical-eval-p phi m) @@ -1765,12 +1759,10 @@ (twoargcheck form) (let ((phi (simpcheck (cadr form) z)) (m (simpcheck (caddr form) z))) - (cond ((or (and (floatp phi) (floatp m)) - (and $numer (numberp phi) (numberp m))) + (cond ((float-numerical-eval-p phi m) ;; Numerically evaluate it (elliptic-e (float phi) (float m))) - ((and (complex-number-p phi) - (complex-number-p m)) + ((complex-float-numerical-eval-p phi m) (complexify (bigfloat::bf-elliptic-e (complex ($realpart phi) ($imagpart phi)) (complex ($realpart m) ($imagpart m))))) ((or (bigfloat-numerical-eval-p phi m) |