Update of /project/oct/cvsroot/oct In directory clnet:/tmp/cvs-serv2164

Modified Files: qd-const.lisp Log Message: Oops. %MAKE-QD-D is a macro and not a function for some Lisps, so we can't multiple-value-call it. Rearrange code accordingly.

--- /project/oct/cvsroot/oct/qd-const.lisp 2007/10/15 18:53:43 1.19 +++ /project/oct/cvsroot/oct/qd-const.lisp 2007/10/16 13:44:00 1.20 @@ -40,72 +40,79 @@ ;; 3.1415926535897932384626433832795028841971693993751058209749445923078L0 ;; #q3.1415926535897932384626433832795028841971693993751058209749445923q0 (defconstant +qd-pi+ - (multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 7074237752028440 1.0d0) -51) - (scale-float (float 4967757600021511 1.0d0) -105) - (scale-float (float -8753721960665020 1.0d0) -161) - (scale-float (float 5857755168774013 1.0d0) -215) - (scale-float (float 5380502254059520 1.0d0) -269)))) + (multiple-value-bind (q0 q1 q2 q3) + (renorm-5 (scale-float (float 7074237752028440 1.0d0) -51) + (scale-float (float 4967757600021511 1.0d0) -105) + (scale-float (float -8753721960665020 1.0d0) -161) + (scale-float (float 5857755168774013 1.0d0) -215) + (scale-float (float 5380502254059520 1.0d0) -269)) + (%make-qd-d q0 q1 q2 q3)))

;; 6.2831853071795864769252867665590057683943387987502116419498891846156328125724L0 ;; #q6.2831853071795864769252867665590057683943387987502116419498891846q0 (defconstant +qd-2pi+ - (multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 7074237752028440 1.0d0) -50) - (scale-float (float 4967757600021511 1.0d0) -104) - (scale-float (float -8753721960665020 1.0d0) -160) - (scale-float (float 5857755168774013 1.0d0) -214) - (scale-float (float 5380502254059520 1.0d0) -268)))) + (multiple-value-bind (q0 q1 q2 q3) + (renorm-5 (scale-float (float 7074237752028440 1.0d0) -50) + (scale-float (float 4967757600021511 1.0d0) -104) + (scale-float (float -8753721960665020 1.0d0) -160) + (scale-float (float 5857755168774013 1.0d0) -214) + (scale-float (float 5380502254059520 1.0d0) -268)) + (%make-qd-d q0 q1 q2 q3)))

;; 1.5707963267948966192313216916397514420985846996875529104874722961539082031431L0 ;; #q1.57079632679489661923132169163975144209858469968755291048747229615q0 (defconstant +qd-pi/2+ - (multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 7074237752028440 1.0d0) -52) - (scale-float (float 4967757600021511 1.0d0) -106) - (scale-float (float -8753721960665020 1.0d0) -162) - (scale-float (float 5857755168774013 1.0d0) -216) - (scale-float (float 5380502254059520 1.0d0) -270)))) + (multiple-value-bind (q0 q1 q2 q3) + (renorm-5 (scale-float (float 7074237752028440 1.0d0) -52) + (scale-float (float 4967757600021511 1.0d0) -106) + (scale-float (float -8753721960665020 1.0d0) -162) + (scale-float (float 5857755168774013 1.0d0) -216) + (scale-float (float 5380502254059520 1.0d0) -270)) + (%make-qd-d q0 q1 q2 q3)))

;; 0.78539816339744830961566084581987572104929234984377645524373614807695410157155L0 ;; #q0.785398163397448309615660845819875721049292349843776455243736148076q0 (defconstant +qd-pi/4+ - (multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 7074237752028440 1.0d0) -53) - (scale-float (float 4967757600021511 1.0d0) -107) - (scale-float (float -8753721960665020 1.0d0) -163) - (scale-float (float 5857755168774013 1.0d0) -217) - (scale-float (float 5380502254059520 1.0d0) -271)))) + (multiple-value-bind (q0 q1 q2 q3) + (renorm-5 (scale-float (float 7074237752028440 1.0d0) -53) + (scale-float (float 4967757600021511 1.0d0) -107) + (scale-float (float -8753721960665020 1.0d0) -163) + (scale-float (float 5857755168774013 1.0d0) -217) + (scale-float (float 5380502254059520 1.0d0) -271)) + (%make-qd-d q0 q1 q2 q3)))

;; 2.35619449019234492884698253745962716314787704953132936573120844423086230471467L0 ;; #q2.35619449019234492884698253745962716314787704953132936573120844423q0 (defconstant +qd-3pi/4+ - (multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 5305678314021330 1.0d0) -51) - (scale-float (float 7451636400032266 1.0d0) -106) - (scale-float (float 5724553519491610 1.0d0) -160) - (scale-float (float -6810541066450737 1.0d0) -214) - (scale-float (float -7491566988951552 1.0d0) -273)))) + (multiple-value-bind (q0 q1 q2 q3) + (renorm-5 (scale-float (float 5305678314021330 1.0d0) -51) + (scale-float (float 7451636400032266 1.0d0) -106) + (scale-float (float 5724553519491610 1.0d0) -160) + (scale-float (float -6810541066450737 1.0d0) -214) + (scale-float (float -7491566988951552 1.0d0) -273)) + (%make-qd-d q0 q1 q2 q3)))

;; 0.00306796157577128245943617517898388953534879824157725177829584432842560195926387L0 ;; #q0.00306796157577128245943617517898388953534879824157725177829584432842q0 (defconstant +qd-pi/1024+ - (multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 7074237752028440 1.0d0) -61) - (scale-float (float 4967757600021511 1.0d0) -115) - (scale-float (float -8753721960665020 1.0d0) -171) - (scale-float (float 5857755168774013 1.0d0) -225) - (scale-float (float 5380502254059520 1.0d0) -279)))) + (multiple-value-bind (q0 q1 q2 q3) + (renorm-5 (scale-float (float 7074237752028440 1.0d0) -61) + (scale-float (float 4967757600021511 1.0d0) -115) + (scale-float (float -8753721960665020 1.0d0) -171) + (scale-float (float 5857755168774013 1.0d0) -225) + (scale-float (float 5380502254059520 1.0d0) -279)) + (%make-qd-d q0 q1 q2 q3)))

;; 2.71828182845904523536028747135266249775724709369995957496696762772407663035355L0 ;; #q2.71828182845904523536028747135266249775724709369995957496696762773q0 (defconstant +qd-e+ - (multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 6121026514868073 1.0d0) -51) - (scale-float (float 5864240480059706 1.0d0) -105) - (scale-float (float -6219324074349538 1.0d0) -161) - (scale-float (float 7980724272743021 1.0d0) -215) - (scale-float (float -8855251465666560 1.0d0) -269)))) + (multiple-value-bind (q0 q1 q2 q3) + (renorm-5 (scale-float (float 6121026514868073 1.0d0) -51) + (scale-float (float 5864240480059706 1.0d0) -105) + (scale-float (float -6219324074349538 1.0d0) -161) + (scale-float (float 7980724272743021 1.0d0) -215) + (scale-float (float -8855251465666560 1.0d0) -269)) + (%make-qd-d q0 q1 q2 q3)))

;; 0.693147180559945309417232121458176568075500134360255254120680009493393621969696L0 ;; #q0.693147180559945309417232121458176568075500134360255254120680009495q0 @@ -132,12 +139,13 @@ ;; 2.30258509299404568401799145468436420760110148862877297603332790096757260967737L0 ;; #q2.30258509299404568401799145468436420760110148862877297603332790095q0 (defconstant +qd-log10+ - (multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 5184960683398422 1.0d0) -51) - (scale-float (float -8805633374462953 1.0d0) -105) - (scale-float (float -7296007962371596 1.0d0) -159) - (scale-float (float -5296362421624049 1.0d0) -213) - (scale-float (float 4574234754834432 1.0d0) -267)))) + (multiple-value-bind (q0 q1 q2 q3) + (renorm-5 (scale-float (float 5184960683398422 1.0d0) -51) + (scale-float (float -8805633374462953 1.0d0) -105) + (scale-float (float -7296007962371596 1.0d0) -159) + (scale-float (float -5296362421624049 1.0d0) -213) + (scale-float (float 4574234754834432 1.0d0) -267)) + (%make-qd-d q0 q1 q2 q3)))

(defconstant +qd-eps+ (scale-float 1d0 -209)) @@ -145,3083 +153,3595 @@ (defconstant +qd-sin-table+ (make-array 256 :initial-contents (list - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 7074226654454970 1.0d0) -61) - (scale-float (float 5271335698347442 1.0d0) -115) - (scale-float (float 7913822574154586 1.0d0) -170) - (scale-float (float -4804352564403217 1.0d0) -224) - (scale-float (float 6064389487591424 1.0d0) -278))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 7074193361797233 1.0d0) -60) - (scale-float (float 7522205695703707 1.0d0) -116) - (scale-float (float 7787047147324868 1.0d0) -175) - (scale-float (float -6728650631839117 1.0d0) -232) - (scale-float (float 5184626653921280 1.0d0) -286))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 5305603405682435 1.0d0) -59) - (scale-float (float -5041342953893321 1.0d0) -115) - (scale-float (float 8335474310793984 1.0d0) -170) - (scale-float (float 6743025479788607 1.0d0) -225) - (scale-float (float -6023389004300288 1.0d0) -279))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 7074060192106372 1.0d0) -59) - (scale-float (float 7185921569156509 1.0d0) -113) - (scale-float (float -6016799991653399 1.0d0) -170) - (scale-float (float -5577663458559350 1.0d0) -224) - (scale-float (float -7969393573560320 1.0d0) -278))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 8842450394781643 1.0d0) -59) - (scale-float (float -8771095658131507 1.0d0) -113) - (scale-float (float 8705573170983202 1.0d0) -167) - (scale-float (float -4692271881407162 1.0d0) -221) - (scale-float (float 8141919777882112 1.0d0) -275))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 5305378684473085 1.0d0) -58) - (scale-float (float 7704904742673764 1.0d0) -113) - (scale-float (float 7308626221243388 1.0d0) -167) - (scale-float (float 4905810005485122 1.0d0) -223) - (scale-float (float -5326632406941696 1.0d0) -277))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 6189482235310630 1.0d0) -58) - (scale-float (float -4715432182777116 1.0d0) -113) - (scale-float (float -8243063834437948 1.0d0) -168) - (scale-float (float 8566398131092182 1.0d0) -222) - (scale-float (float -6086611201163264 1.0d0) -277))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 7073527528384126 1.0d0) -58) - (scale-float (float -7632135562854704 1.0d0) -116) - (scale-float (float 7289253486557291 1.0d0) -170) - (scale-float (float -7590289326531904 1.0d0) -224) - (scale-float (float 7722148853710848 1.0d0) -279))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 7957506242722589 1.0d0) -58) - (scale-float (float -8272553670927212 1.0d0) -112) - (scale-float (float -6591995918745221 1.0d0) -166) - (scale-float (float -4636857096009409 1.0d0) -220) - (scale-float (float 7183488739295232 1.0d0) -275))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 8841410057981697 1.0d0) -58) - (scale-float (float -5627969559234247 1.0d0) -118) - (scale-float (float 6018105389463175 1.0d0) -172) - (scale-float (float 7544891264015395 1.0d0) -230) - (scale-float (float 6209179752595456 1.0d0) -284))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 4862615327261055 1.0d0) -57) - (scale-float (float -5217239170857332 1.0d0) -111) - (scale-float (float -6336246586437174 1.0d0) -165) - (scale-float (float 5522987872330073 1.0d0) -219) - (scale-float (float -5649337847988224 1.0d0) -273))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 5304479856743885 1.0d0) -57) - (scale-float (float 6340842145528512 1.0d0) -113) - (scale-float (float -7566831660699656 1.0d0) -167) - (scale-float (float -7114412056121165 1.0d0) -221) - (scale-float (float -8974201406881792 1.0d0) -279))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 5746294458442105 1.0d0) -57) - (scale-float (float 4845186982751657 1.0d0) -113) - (scale-float (float 6382779118838290 1.0d0) -167) - (scale-float (float 8090523197847278 1.0d0) -221) - (scale-float (float 6384881576181760 1.0d0) -276))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 6188054973828419 1.0d0) -57) - (scale-float (float 7360584602593505 1.0d0) -111) - (scale-float (float 7946504576809704 1.0d0) -165) - (scale-float (float 5731224328660037 1.0d0) -219) - (scale-float (float 6575748996808704 1.0d0) -273))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 6629757244884614 1.0d0) -57) - (scale-float (float -5806448969106076 1.0d0) -112) - (scale-float (float 7037190739826080 1.0d0) -166) - (scale-float (float 5552037724818900 1.0d0) -223) - (scale-float (float 6596791471308800 1.0d0) -277))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 7071397114140692 1.0d0) -57) - (scale-float (float -7057477599664784 1.0d0) -113) - (scale-float (float -8290828586102809 1.0d0) -167) - (scale-float (float -6697971486035361 1.0d0) -222) - (scale-float (float -7883618700230656 1.0d0) -277))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 7512970424714007 1.0d0) -57) - (scale-float (float -6294023145184360 1.0d0) -111) - (scale-float (float -6395720725273163 1.0d0) -165) - (scale-float (float -7071774105018818 1.0d0) -219) - (scale-float (float -5298326162341888 1.0d0) -274))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 7954473020348387 1.0d0) -57) - (scale-float (float -6926679705961747 1.0d0) -112) - (scale-float (float -6427721451859560 1.0d0) -167) - (scale-float (float 8028310015339695 1.0d0) -222) - (scale-float (float 6198625664499712 1.0d0) -277))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 8395900745453257 1.0d0) -57) - (scale-float (float 4839201044457661 1.0d0) -114) - (scale-float (float 5799570435052711 1.0d0) -171) - (scale-float (float -5529353034270453 1.0d0) -226) - (scale-float (float 6823048531410944 1.0d0) -280))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 8837249445142752 1.0d0) -57) - (scale-float (float -5314952832401406 1.0d0) -113) - (scale-float (float -7992910057771694 1.0d0) -167) - (scale-float (float 8886165424019995 1.0d0) -221) - (scale-float (float 8017893964447744 1.0d0) -276))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 4639257482637412 1.0d0) -56) - (scale-float (float -5494228531443205 1.0d0) -110) - (scale-float (float 6222043711193090 1.0d0) -167) - (scale-float (float 4966112393074763 1.0d0) -221) - (scale-float (float 6647651906093056 1.0d0) -275))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 4859846576245171 1.0d0) -56) - (scale-float (float -8985502920124077 1.0d0) -110) - (scale-float (float 7440463379940699 1.0d0) -165) - (scale-float (float -6641325637598524 1.0d0) -219) - (scale-float (float -5163628344082432 1.0d0) -273))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 5080389927126093 1.0d0) -56) - (scale-float (float -8898661047761268 1.0d0) -110) - (scale-float (float -4667727006484474 1.0d0) -164) - (scale-float (float 8478536563323652 1.0d0) -218) - (scale-float (float 8774483460931584 1.0d0) -273))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 5300885459442166 1.0d0) -56) - (scale-float (float -7213383224879916 1.0d0) -111) - (scale-float (float -8534269322822802 1.0d0) -166) - (scale-float (float -6601733372219099 1.0d0) -221) - (scale-float (float 8396826690453504 1.0d0) -278))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 5521331097805465 1.0d0) -56) - (scale-float (float 4829604598179156 1.0d0) -114) - (scale-float (float -7893599535446481 1.0d0) -172) - (scale-float (float -5384211130874634 1.0d0) -226) - (scale-float (float -5250039492378624 1.0d0) -282))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 5741724767297686 1.0d0) -56) - (scale-float (float -5824155811343436 1.0d0) -110) - (scale-float (float 6673985610265747 1.0d0) -164) - (scale-float (float 4800782739249759 1.0d0) -220) - (scale-float (float 7109827096051712 1.0d0) -274))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 5962064393489674 1.0d0) -56) - (scale-float (float 7651360099479755 1.0d0) -112) - (scale-float (float 6974817744235260 1.0d0) -167) - (scale-float (float 7824970858345265 1.0d0) -224) - (scale-float (float -7627319001219072 1.0d0) -278))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 6182347902460953 1.0d0) -56) - (scale-float (float -8796242544913562 1.0d0) -111) - (scale-float (float -7546272905440146 1.0d0) -165) - (scale-float (float 6512061516709508 1.0d0) -219) - (scale-float (float 5909873078861824 1.0d0) -273))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 6402573220819241 1.0d0) -56) - (scale-float (float -4868008820827392 1.0d0) -110) - (scale-float (float 8779206749884591 1.0d0) -164) - (scale-float (float -8648470131210884 1.0d0) -218) - (scale-float (float -7064277529821184 1.0d0) -273))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 6622738275719969 1.0d0) -56) - (scale-float (float 6182934508221337 1.0d0) -110) - (scale-float (float 7353282250945404 1.0d0) -165) - (scale-float (float -8166192353391047 1.0d0) -220) - (scale-float (float -8567002520092672 1.0d0) -277))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 6842840994885793 1.0d0) -56) - (scale-float (float -8552477024466766 1.0d0) -110) - (scale-float (float -4997427595980002 1.0d0) -164) - (scale-float (float 5821398332046138 1.0d0) -218) - (scale-float (float 6922342312886272 1.0d0) -273))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 7062879306626092 1.0d0) -56) - (scale-float (float -8487236864497288 1.0d0) -112) - (scale-float (float -4942162982072151 1.0d0) -168) - (scale-float (float -4811145377091453 1.0d0) -223) - (scale-float (float -8730216008515584 1.0d0) -284))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 7282851139856476 1.0d0) -56) - (scale-float (float 8609951212389606 1.0d0) -111) - (scale-float (float -5614142183842944 1.0d0) -165) - (scale-float (float 6068416796043208 1.0d0) -219) - (scale-float (float 8196791178133504 1.0d0) -273))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 7502754424118275 1.0d0) -56) - (scale-float (float 8536169017599928 1.0d0) -110) - (scale-float (float 7981550951145323 1.0d0) -165) - (scale-float (float -8340622458345952 1.0d0) -220) - (scale-float (float 6285858857648128 1.0d0) -274))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 7722587089598028 1.0d0) -56) - (scale-float (float 8362719068102409 1.0d0) -110) - (scale-float (float -7853008551658302 1.0d0) -166) - (scale-float (float -6852498985157079 1.0d0) -220) - (scale-float (float -4875056737550336 1.0d0) -274))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 7942347067146965 1.0d0) -56) - (scale-float (float -5897359216343841 1.0d0) -113) - (scale-float (float 7767443765766550 1.0d0) -169) - (scale-float (float 8203371449514667 1.0d0) -225) - (scale-float (float -8271467659657216 1.0d0) -279))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 8162032288300481 1.0d0) -56) - (scale-float (float 7035687121204020 1.0d0) -111) - (scale-float (float 5733124558862890 1.0d0) -168) - (scale-float (float 6681272325774503 1.0d0) -223) - (scale-float (float 8561939877724160 1.0d0) -281))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 8381640685297609 1.0d0) -56) - (scale-float (float 5345425417737710 1.0d0) -112) - (scale-float (float -8790124191829010 1.0d0) -166) - (scale-float (float 7297964455931531 1.0d0) -225) - (scale-float (float 6532791441293312 1.0d0) -279))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 8601170191100479 1.0d0) -56) - (scale-float (float -5127404751534987 1.0d0) -110) - (scale-float (float 8258618371098839 1.0d0) -164) - (scale-float (float 6354475203379338 1.0d0) -221) - (scale-float (float 6679197895688192 1.0d0) -275))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 8820618739413774 1.0d0) -56) - (scale-float (float 7361249450583405 1.0d0) -111) - (scale-float (float 8489175872343797 1.0d0) -165) - (scale-float (float -4838736209868180 1.0d0) -220) - (scale-float (float -8316549956370432 1.0d0) -277))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 4519992132352091 1.0d0) -55) - (scale-float (float 6319901705801489 1.0d0) -110) - (scale-float (float 5600764727998866 1.0d0) -166) - (scale-float (float -5650573825026412 1.0d0) -220) - (scale-float (float 8973806114308096 1.0d0) -274))) - #.(multiple-value-call #'%make-qd-d - (renorm-5 (scale-float (float 4629632351109917 1.0d0) -55) - (scale-float (float 4958462282897610 1.0d0) -110) - (scale-float (float -8711719640720475 1.0d0) -165) - (scale-float (float -8191834096705166 1.0d0) -221) - (scale-float (float -5689038166556672 1.0d0) -275)))

[6432 lines skipped]