Menu
▾
▴
[Maxima-commits] CVS: maxima/share/algebra grob1.lisp,1.7,1.8
|
From: Andreas E. <ar...@us...> - 2007-05-04 16:18:49
|
Update of /cvsroot/maxima/maxima/share/algebra In directory sc8-pr-cvs16:/tmp/cvs-serv9383/share/algebra Modified Files: grob1.lisp Log Message: replaced use of cancat by format and/or intern. Index: grob1.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/share/algebra/grob1.lisp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- grob1.lisp 20 Mar 2007 15:40:23 -0000 1.7 +++ grob1.lisp 4 May 2007 16:18:46 -0000 1.8 @@ -513,15 +513,9 @@ q (inserer p $base)) (cond (q (reduire $base q nil) - (print (concat " -" - " nbsyz = " $nbsyz - " nbred = " $nbred - " nbreduc = " $nbreduc - " nbred0 = " $nbred0 - " lbase = " (length (cdr $base)) - " -" )) + (format t "~% nbsyz = ~a nbred = ~a nbreduc = ~a nbred0 = ~a lbase = ~d~%" + $nbsyz $nbred $nbreduc $nbred0 (length (cdr base))) + (print (escalier (cdr $base))) (print " ") @@ -529,19 +523,9 @@ (setq l (vivier paires))) (t (setq l (cdr l)) - (print (concat - " -" - " nbsyz = " $nbsyz - " nbred = " $nbred - " nbreduc = " $nbreduc - " nbred0 = " $nbred0 - " lbase = " (length (cdr $base)) - " -" - " paires a voir = " (length l) - " -" )) + (format t "~% nbsyz = ~a nbred = ~a nbreduc = ~a nbred0 = ~a lbase = ~a~% paires a voir = ~d~%" + $nbsyz $nbred $nbreduc $nbred0 (length (cdr base)) (length l)) + ))))) ;paire suivante (setq $base (cdr $base)) (mapc #'(lambda (u) (idivise2 u $base)) @@ -551,8 +535,8 @@ (defun apparier (p q expp expq) (cons (cons - (mapcar 'max expp expq) ;caar - (zerop (apply '+ ;cdar ;exposants etrangers + (mapcar #'max expp expq) ;caar + (zerop (apply #'+ ;cdar ;exposants etrangers (mapcar 'min expp expq)))) (cons (cons expp expq) ;caadr cdadr |