From: Wolfgang J. <wje...@us...> - 2003-03-27 01:17:04
|
Update of /cvsroot/maxima/maxima/share/affine In directory sc8-pr-cvs1:/tmp/cvs-serv32121 Modified Files: sheafc.lisp sheafb.lisp Log Message: ANSI CL has no ~Q format directive (nor has GCL it). Replace (format ... ~VQ ... 'fsh ...) by (format ... ~/maxima::tilde-q-fsh/ ...). Don't use FSH as parameter since ~VQ isn't used with anything else and parameters to format directives "should" be integers or characters, anyway. Index: sheafc.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/share/affine/sheafc.lisp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- sheafc.lisp 26 Mar 2003 05:40:45 -0000 1.4 +++ sheafc.lisp 27 Mar 2003 01:17:00 -0000 1.5 @@ -192,8 +192,8 @@ do (fsignal "This refinement is not sufficient.")) ;;what here???? - (format t "~%Refining for the equations ~VQ with inequality ~VQ ~ - ~%Using inequalities ~VQ " list-eqns 'fsh gg 'fsh answ 'fsh) + (format t "~%Refining for the equations ~/maxima::tilde-q-fsh/ with inequality ~/maxima::tilde-q-fsh/ ~ + ~%Using inequalities ~/maxima::tilde-q-fsh/ " list-eqns gg answ) (setq refs (sloop for gg in answ @@ -607,9 +607,9 @@ when (and tem (not (= (length (ldata-eqns tem)) (length (ldata-eqns ld))))) do (ferror "wrong number of equations") do - (format t "~2%On open ~A the inequality is ~VQ (before refinement).~ - ~%The translated equations are ~VQ. " - op-number (zopen-inequality op) 'fsh (ldata-eqns tem) 'fsh ) + (format t "~2%On open ~A the inequality is ~/maxima::tilde-q-fsh/ (before refinement).~ + ~%The translated equations are ~/maxima::tilde-q-fsh/. " + op-number (zopen-inequality op) (ldata-eqns tem)) ; when tem do (fsignal 'hi) finally (multiple-value ( ref-pls transl-eqns) @@ -625,8 +625,8 @@ (multiple-value (norm-op tr-data) (normalize-zopen op eqns :data lis-dat)) - (format t "~%On this open ~VQ will correspond to ~VQ" eqns 'fsh - (sloop for i from 1 to (length eqns) collecting (xxx i)) 'fsh) + (format t "~%On this open ~/maxima::tilde-q-fsh/ will correspond to ~/maxima::tilde-q-fsh/" eqns + (sloop for i from 1 to (length eqns) collecting (xxx i))) (check-normalization open-for-equations norm-op orig-eqns) ; (break 'prepare1) (format t "~%normalizing open ~A . " i) @@ -1241,7 +1241,7 @@ collecting (setq tem (sloop for ld in (cdr lis) when (not (numberp (setq tem (car (ldata-eqns ld))))) collecting tem)) - do (format t "~%On open ~D the divisors are ~VQ" i tem 'fsh))) + do (format t "~%On open ~D the divisors are ~/maxima::tilde-q-fsh/" i tem))) (defmacro alter-ldata (ldat &rest keys) (sloop for (key repl) on keys by 'cddr @@ -1295,7 +1295,7 @@ (setq to-invert (sftimes 1 to-invert)) (cond((eql (length (ldata-eqns ld)) rank) (cond ((may-invertp to-invert open-g)) - (t(format t "having to invert ~VQ" to-invert 'fsh) + (t(format t "having to invert ~/maxima::tilde-q-fsh/" to-invert) (setq open-g (sftimes open-g to-invert)))))) (setq vari (linear-ldatap ld :open-g (setq open-g(st-rat open-g)))) (cond ((null vari) (fsignal "equations not linear-ldatap"))) Index: sheafb.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/share/affine/sheafb.lisp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- sheafb.lisp 26 Mar 2003 05:40:46 -0000 1.4 +++ sheafb.lisp 27 Mar 2003 01:17:00 -0000 1.5 @@ -515,7 +515,7 @@ (setq ichart (ichart ith firstk ambient-dim)) (setq ld (copy-list ld)) (setq trans (apply-rmap (zopen-inv ichart) ld)) - (format t "~%Exceptional divisor is ~vq." (xxx ith) 'fsh) + (format t "~%Exceptional divisor is ~/maxima::tilde-q-fsh/." (xxx ith)) (setq answ (cdr (eliminate-common-factors (cons (pexpt (xxx ith) 10) (ldata-eqns trans) )))) @@ -1269,10 +1269,10 @@ ;;the pairs (zopen . (list ldata1 ldata2..)) (setq refs (open-refinement (car w) (first *stop-simplify*) (second *stop-simplify*))) - (format t "~%Refining open number ~D into ~D opens with inequalities ~VQ" + (format t "~%Refining open number ~D into ~D opens with inequalities ~/maxima::tilde-q-fsh/" (find-position-in-list (car w) (pls-opens pls)) (length refs) (sloop for v in refs collecting - (zopen-inequality v)) 'fsh) + (zopen-inequality v))) (iassert (not (null *refine-opens*))) (sloop for vv in tem do (check-arg vv (eq (car vv)'ldata) "an ldata")) (setq v (cons nil @@ -1371,7 +1371,7 @@ finally (push i bad-components) - (format t "**The component ~vq ~%does not contain the original data***** " v 'fsh) + (format t "**The component ~/maxima::tilde-q-fsh/ ~%does not contain the original data***** " v) (cond (*signal-component-error* (fsignal "not contained" v))))) bad-components) @@ -1388,8 +1388,8 @@ when (not ($zerop (polysimp u))) do (mshow u (polysimp u)) - (format t "**The ideal: ~VQ ~%does not contain the original one *** : ~vQ" - v 'fsh ldata 'fsh) + (format t "**The ideal: ~/maxima::tilde-q-fsh/ ~%does not contain the original one *** : ~/maxima::tilde-q-fsh/" + v ldata) (push-new i bad-components) (loop-return (break t))) (format t "~% Component ~D verified:" i) |