[Maxima-commits] CVS: maxima/tests rtest15.mac,1.80,1.81

[Dieter K. <cra...@us...>]

Update of /cvsroot/maxima/maxima/tests
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv13246/tests

Modified Files:
	rtest15.mac 
Log Message:
Adjusting two examples because of revision 1.32 of comm2.lisp. The results are equivalent, but the arguments of the log functions look more simple.

Index: rtest15.mac
===================================================================
RCS file: /cvsroot/maxima/maxima/tests/rtest15.mac,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- rtest15.mac	23 Jun 2009 20:13:50 -0000	1.80
+++ rtest15.mac	27 Apr 2010 23:01:39 -0000	1.81
@@ -596,9 +596,10 @@
  * The call to factor is to get rid of some numerical factors.
  */
 ratsimp(ev(logcontract((integrate(1/(x^8-1),x,0,1/2))),algebraic) + 
-(sqrt(2)*log((20*sqrt(2)+33)/17)+2*sqrt(2)*atan((sqrt(2)+2)/2)
-                                 +2*sqrt(2)*atan((sqrt(2)-2)/2)+log(9)
-                                 +4*atan(1/2))
+(sqrt(2)*log((2^(3/2)+5)/(2^(3/2)-5)/-1)
+      +2*sqrt(2)*atan((sqrt(2)+2)/2)
+      +2*sqrt(2)*atan((sqrt(2)-2)/2)+log(9)
+      +4*atan(1/2))
  /16);
 0;
 
@@ -617,8 +618,9 @@
  * Here's one of the tests listed in that bug report.
  */
 logcontract(ratsimp(factor(integrate (1/((x-3)^4+1), x,0,1)))),algebraic;
-(sqrt(2)*log(-((190*sqrt(2)-747)/697))+2*sqrt(2)*atan((7*sqrt(2)+5)/73)
-				    +2*sqrt(2)*atan((7*sqrt(2)-5)/73))
+(sqrt(2)*log((5*sqrt(2)-38)/(5*sqrt(2)+38)/-1)
+ +2^(3/2)*atan((7*sqrt(2)+5)/73)+2^(3/2)*atan((7*sqrt(2)-5)/73))
+
  /8$
 /*
  * Work around in residu.lisp, rev 1.9