[Maxima-commits] CVS: maxima/src compar.lisp,1.58,1.59

[David Billinghurst <billingd@us...>]

Update of /cvsroot/maxima/maxima/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13534/src

Modified Files:
	compar.lisp 
Log Message:
Bug 2876387: ode2 asks if sqrt(3) is an integer

Extend compar.lisp:nonintegerp to recognise that sqrt(number) is not an 
integer.

Add new file rtest_ask.mac to testsuite.


Index: compar.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/compar.lisp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- compar.lisp	8 Oct 2009 19:45:54 -0000	1.58
+++ compar.lisp	17 Oct 2009 10:58:31 -0000	1.59
@@ -1698,8 +1698,10 @@
 		(prog2
 		    (setq e ($denom e))
 		    (or (eq (csign (sub e num)) '$pos)
-			(eq (csign (add2 e num)) '$neg))))
-	   t))))
+			(eq (csign (add2 e num)) '$neg)))) t)
+          ;; Assumes a simplified sqrt of a number is not an integer.
+          ((and (mexptp e) (mnump (second e)) (alike1 (third e) 1//2)) t)
+	  (t nil))))
 
 (defun intp (l)
   (every #'maxima-integerp (cdr l)))

[Maxima-commits] CVS: maxima/tests rtest_ask.mac, NONE, 1.1 rtestode.mac, 1.17, 1.18 testsuite.lisp, 1.84, 1.85

[David Billinghurst <billingd@us...>]

Update of /cvsroot/maxima/maxima/tests
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13534/tests

Modified Files:
	rtestode.mac testsuite.lisp 
Added Files:
	rtest_ask.mac 
Log Message:
Bug 2876387: ode2 asks if sqrt(3) is an integer

Extend compar.lisp:nonintegerp to recognise that sqrt(number) is not an 
integer.

Add new file rtest_ask.mac to testsuite.


--- NEW FILE: rtest_ask.mac ---
/* Test askinteger and asksign */

(kill(all),0);
0$

map(askinteger,[0,1/2,sqrt(17)]);
[yes,no,no]$

/* Known constants */
map(askinteger,[%pi,%e,%phi,%gamma,%i]);
[no,no,no,no,no]$



map(asksign,[%pi,%e,%phi,%gamma,inf,minf]);
[pos,pos,pos,pos,pos,neg]$

errcatch(asksign(%i));
[]$ /* argument cannot be imaginary. */

errcatch(asksign(infinity));
[]$ /* sign of infinity is undefined. */

Index: rtestode.mac
===================================================================
RCS file: /cvsroot/maxima/maxima/tests/rtestode.mac,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- rtestode.mac	11 Oct 2009 00:41:14 -0000	1.17
+++ rtestode.mac	17 Oct 2009 10:58:32 -0000	1.18
@@ -109,18 +109,11 @@
 y = %k1*bessel_j(v,x)+%k2*bessel_j(-v,x);
 (remove(v,noninteger),method);
 bessel;
-
-ode2(x^2*'diff(y,x,2)+x*'diff(y,x)+(x^2-%e^2)*y=0,y,x);
-y = %k1*bessel_j(%e,x)+%k2*bessel_j(-%e,x);
-method;
-bessel;
-
-/* FIXME 2009-10-11: Doesn't work yet. 
+ 
 ode2(x^2*'diff(y,x,2)+x*'diff(y,x)+(x^2-3)*y=0,y,x);
 y = %k1*bessel_j(sqrt(3),x)+%k2*bessel_j(-sqrt(3),x);
 method;
 bessel;
-*/
 
 ode2( 'diff(y,x,2)+2*'diff(y,x)+y=exp(x), y, x);
 y=exp(x)/4+(%k2*x+%k1)*exp(-x);

Index: testsuite.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/tests/testsuite.lisp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- testsuite.lisp	26 Sep 2009 12:27:52 -0000	1.84
+++ testsuite.lisp	17 Oct 2009 10:58:33 -0000	1.85
@@ -51,4 +51,5 @@
 	"rtest_elliptic"
 	"rtest_integrate"
 	"rtest_integrate_special"
+        "rtest_ask"
 	))