Menu
▾
▴
[Maxima-commits] CVS: maxima/share/misc seqopt.lisp,1.7,1.8
|
From: Andreas E. <ar...@us...> - 2008-06-07 13:33:33
|
Update of /cvsroot/maxima/maxima/share/misc In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27094/share/misc Modified Files: seqopt.lisp Log Message: changed all uses of fixp to fixnump (which is defined in clmacs). Index: seqopt.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/share/misc/seqopt.lisp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- seqopt.lisp 10 Apr 2007 18:48:27 -0000 1.7 +++ seqopt.lisp 7 Jun 2008 13:33:27 -0000 1.8 @@ -240,7 +240,7 @@ (defun disp-negate (x) (cond ((mtimesp x) (let ((coeff (cadr x))) - (cond ((and (fixp coeff) (minusp coeff)) + (cond ((and (fixnump coeff) (minusp coeff)) (append `((mtimes) ,(- coeff)) (cddr x))) (t `((mminus) ,x))))) ((mnump x) (mul -1 x)) @@ -252,7 +252,7 @@ ((eq (caar x) 'mtimes) (mapc 'fix-unary-minus (cdr x)) (let ((sign (cadr x))) - (cond ((and (fixp sign) (minusp sign)) + (cond ((and (fixnump sign) (minusp sign)) (cond ((equal sign -1) (let ((chk-merge (caddr x))) (cond ((and (not (atom chk-merge)) @@ -309,7 +309,7 @@ ((null lk)) (and (alike1 nx (caddar lk)) (return (cadar lk)))))) - (cond ((fixp tmp) + (cond ((fixnump tmp) (cond (sym (rplacd xpair sym) (mformat nil "c - earlier opt-vect, ~M, occurs ~M time(s)" sym tmp) @@ -439,15 +439,15 @@ (let* ((obj (car next)) (result obj)) (and (mexptp result) (let ((expon (exponent result))) - (and (not (fixp expon)) + (and (not (fixnump expon)) (do ((remain (cdr next) (cdr remain))) ((null remain)) (let ((powered? (car remain))) (and (mexptp powered?) (let ((expon-2 (exponent powered?))) - (and (not (fixp expon-2)) + (and (not (fixnump expon-2)) (let ((intdif (sub expon expon-2))) - (and (fixp intdif) + (and (fixnump intdif) (let ((pf (> intdif 0)) (ab intdif)) (declare (fixnum ab)) @@ -530,7 +530,7 @@ (result (fgcd-exponent-gather obj))) (and (mexptp result) (let ((expon (exponent result))) - (and (not (fixp expon)) + (and (not (fixnump expon)) (do ((allow-fix t nil) (repeat t)) ((null repeat)) @@ -540,13 +540,13 @@ ((null remain) (or allow-fix (setq repeat nil)) (and pntrs - (if (fixp current-gcd) + (if (fixnump current-gcd) (<= (multiplies-in-nth-power current-gcd) (1+ (length pntrs))) t) (let* ((leadiv (gen-quotients (div-q expon current-gcd))) (a-single (equal leadiv 1)) - (ints (and (not a-single) (fixp leadiv)))) + (ints (and (not a-single) (fixnump leadiv)))) (do ((scan pntrs (cdr scan)) (save (cond (ints (- $cost_float_power @@ -594,7 +594,7 @@ others (nconc others (let ((mbase (base expt))) (cond ((mtimesp mbase) (cdr mbase)) (t (ncons mbase))))))) - ((fixp nxdiv) + ((fixnump nxdiv) (setq save (+ save (- $cost_float_power (multiplies-in-nth-power nxdiv))) interms `(,.interms ,(make-expt (base expt) nxdiv)))) @@ -603,15 +603,15 @@ (let ((powered? (car remain))) (and (mexptp powered?) (let ((expon-2 (exponent powered?))) - (and (not (fixp expon-2)) + (and (not (fixnump expon-2)) (let ((fgcd (gen-quotients ($gcd current-gcd expon-2)))) (cond ((equal fgcd 1)) ((or pntrs (alike1 fgcd expon) (alike1 fgcd expon-2) (and allow-fix - (or (fixp (div-q expon fgcd)) - (fixp (div-q expon-2 fgcd))))) + (or (fixnump (div-q expon fgcd)) + (fixnump (div-q expon-2 fgcd))))) (cond ((not modified) (setq modified t next (append next nil)) @@ -653,13 +653,13 @@ (let* ((obj (car next)) (result obj)) (and (mexptp result) (let ((expon (exponent result))) - (and (fixp expon) + (and (fixnump expon) (do ((remain (cdr next) (cdr remain))) ((null remain)) (let ((powered? (car remain))) (and (mexptp powered?) (let ((expon-2 (exponent powered?))) - (and (fixp expon-2) + (and (fixnump expon-2) (let* ((intdif (- expon expon-2)) (pf (plusp intdif))) (declare (fixnum intdif)) @@ -738,7 +738,7 @@ (result (igcd-exponent-gather obj))) (and (mexptp result) (let ((expon (exponent result))) - (and (fixp expon) + (and (fixnump expon) (do ((remain (cdr next) (cdr remain)) (current-gcd expon) (pntrs)) @@ -764,7 +764,7 @@ (let ((powered? (car remain))) (and (mexptp powered?) (let ((expon-2 (exponent powered?))) - (and (fixp expon-2) + (and (fixnump expon-2) (let ((intgcd (gcd current-gcd expon-2))) (cond ((not (equal intgcd 1)) (cond ((not modified) |