[Maxima-commits] Maxima, A Computer Algebra System branch master updated. 5.26.0-19-g8b46caf

[Dan G. <dg...@us...>]

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  8b46cafe92010a72ff1ed1c9f2d10dbf279b41d9 (commit)
       via  2191e960032f7e1ac9e1cf1c60d89d2d63aa641f (commit)
      from  8455fc984b66bd5c766848b1179f2396eedd0f2e (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 8b46cafe92010a72ff1ed1c9f2d10dbf279b41d9
Merge: 2191e96 8455fc9
Author: Dan Gildea <dgildea>
Date:   Thu Jan 12 16:43:54 2012 -0500

    Merge branch 'master' of ssh://maxima.git.sourceforge.net/gitroot/maxima/maxima


commit 2191e960032f7e1ac9e1cf1c60d89d2d63aa641f
Author: Dan Gildea <dgildea>
Date:   Thu Jan 12 16:43:16 2012 -0500

    src/defint.lisp:
    o $defint: remove ($domain '$real).  We need complex numbers for
      integrate(exp(sqrt(x^3)),x,0,1),domain:complex;
    
    src/limit.lisp:
    o lhsimp: if term goes to non-zero constant, replace with constant.
      fixes limit(gamma_incomplete(1/3, -x^3)*x/(-x^3)^(1/3), x, 0, plus),domain:complex;
    
    tests/rtestint.mac
    o integrate(exp(sqrt(x^3)),x,0,1) now works with domain:complex

diff --git a/src/defint.lisp b/src/defint.lisp
index 72f86b9..b107186 100644
--- a/src/defint.lisp
+++ b/src/defint.lisp
@@ -193,7 +193,7 @@ in the interval of integration.")
 		 (pcprntd nil)  (*nodiverg nil)  ($logabs t)  ; (limitp t)
 		 (rp-polylogp ())
                  ($%edispflag nil) ; to get internal representation
-		 ($domain '$real) ($m1pbranch ())) ;Try this out.
+		 ($m1pbranch ())) ;Try this out.
 
 	     (make-global-assumptions) ;sets *global-defint-assumptions*
 	     (setq exp (ratdisrep exp))
diff --git a/src/limit.lisp b/src/limit.lisp
index 0003bac..261da1c 100644
--- a/src/limit.lisp
+++ b/src/limit.lisp
@@ -1525,11 +1525,10 @@ It appears in LIMIT and DEFINT.......")
 
 (defun lhsimp (term var val)
   (cond ((atom term)  term)
-	((not (eq (caar term) 'mfactorial))  term)
 	(t
 	 (let ((term-value (limit term var val 'think)))
 	   (cond ((not (member term-value
-			     '($inf $minf $und $ind $infinity $zeroa $zerob) :test #'eq))
+			     '($inf $minf $und $ind $infinity $zeroa $zerob 0) :test #'eq))
 		  term-value)
 		 (t term))))))
 
diff --git a/tests/rtestint.mac b/tests/rtestint.mac
index 610705b..47bcd60 100644
--- a/tests/rtestint.mac
+++ b/tests/rtestint.mac
@@ -830,16 +830,21 @@ false;
 integrate(x^(1/3)/sqrt(-log(x)),x,0,1);
 sqrt(3)*sqrt(%pi)/2;
 
+domain:complex;
+complex;
+
 /* [ 1731624 ] asked about sign of yx in integral containing only z */
 integrate(exp(sqrt(x^3)),x,0,1);
-'integrate(exp(sqrt(x^3)),x,0,1);
-/* answer should be: (sqrt(3)*%i+1)*(gamma(2/3)-gamma_incomplete(2/3,-1))/-3; */
-/* with radexpand:true we get
+2*((-1)^(1/3)*gamma_incomplete(2/3,-1)-(-1)^(1/3)*gamma(2/3))/3;
+/* with radexpand:true and domain:real we get
    integrate(exp(sqrt(x^3)),x)  ->  -2*gamma_incomplete(2/3,-x^(3/2))/3
    (which is not correct) due to invalid simplification in 
    integrate-exp-special
 */
 
+domain:real;
+real;
+
 radexpand:true;
 true;
 

-----------------------------------------------------------------------

Summary of changes:
 src/defint.lisp    |    2 +-
 src/limit.lisp     |    3 +--
 tests/rtestint.mac |   11 ++++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Maxima, A Computer Algebra System