[Maxima-commits] CVS: maxima/src rat3c.lisp,1.8,1.9

[Andrej V. <an...@us...>]

Update of /cvsroot/maxima/maxima/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26089/src

Modified Files:
	rat3c.lisp 
Log Message:
Removed primep and $primep - new definitions in ifactor.lisp

Index: rat3c.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/rat3c.lisp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rat3c.lisp	7 Nov 2005 17:37:12 -0000	1.8
+++ rat3c.lisp	19 Mar 2006 01:49:47 -0000	1.9
@@ -436,12 +436,16 @@
   (do ((pp (if (oddp p) (f- p 2) (f- p 1)) (f- pp 2))) ((f< pp 0))
     (if (primep pp) (return pp))))
 
-(defun primep (p)
-  (and (or (lessp p 14.)
-	   (let ((modulus p))
-	     (and (equal 1 (cexpt 13. (sub1 p))) (equal 1 (cexpt 3 (sub1 p))))))
-       (null (cddr (setq p (cfactorw p))))
-       (= 1 (cadr p))))
+;;;;;;
+;;
+;;  Commenting out funtion primep - new implementation in ifactor.lisp
+;;
+;;(defun primep (p)
+;;  (and (or (lessp p 14.)
+;;	   (let ((modulus p))
+;;	     (and (equal 1 (cexpt 13. (sub1 p))) (equal 1 (cexpt 3 (sub1 p))))))
+;;       (null (cddr (setq p (cfactorw p))))
+;;       (= 1 (cadr p))))
 
 ;; #O <form> reads <form> in octal (base 8)
 
@@ -512,11 +516,15 @@
 ;;	    ((= I 20.)))
 
 
-
-(defmfun $primep (p)
-  (if (not (integerp p))
-      (merror "Argument to `primep' must be an integer:~%~M" p))
-  (let ($intfaclim) (primep (abs p))))
+;;;;;;
+;;
+;;  Commenting out function $primep - new implementation in ifactor.lisp
+;;
+;;
+;;(defmfun $primep (p)
+;;  (if (not (integerp p))
+;;      (merror "Argument to `primep' must be an integer:~%~M" p))
+;;  (let ($intfaclim) (primep (abs p))))
 
 
 (defun leadcoefficient (p) (if (pcoefp p) p (leadcoefficient (caddr p))))