X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/40d546724ba7e4b75599c46fa701074aa6ac1475..48a9c9c1a60f4f5ebc71a5e5269b01109c9dcfa4:/dot/emacs-calc diff --git a/dot/emacs-calc b/dot/emacs-calc index 017f00b..4754b4c 100644 --- a/dot/emacs-calc +++ b/dot/emacs-calc @@ -48,12 +48,19 @@ obtained using `z n' (`calc-integrate-numerically')." (list 'calcFunc-sqrt (list '* d d)) x) (and a b (list a b))))) - -(defvar var-IntegNumerRules 'calc-IntegNumerRules) -(defun calc-IntegNumerRules () - (math-read-plain-expr "[ -integ(f, x, a, b) := ninteg(f, x, a, b) :: constant(a) :: constant(b) -]")) +(put 'calc-define 'calc-path-length + '(progn (define-key calc-mode-map "zp" 'calc-path-length))) + +(defvar var-IntegNumerRules + '(vec (calcFunc-condition + (calcFunc-condition + (calcFunc-assign + (calcFunc-integ (var f var-f) (var x var-x) + (var a var-a) (var b var-b)) + (calcFunc-ninteg (var f var-f) (var x var-x) + (var a var-a) (var b var-b))) + (calcFunc-constant (var a var-a))) + (calcFunc-constant (var b var-b))))) (defun calc-integrate-numerically () "Computes an approximate result for a symbolic definite integral with @@ -62,52 +69,134 @@ constant bounds." (calc-slow-wrapper (calc-enter-result 1 "intn" (math-rewrite (calc-top-n 1) var-IntegNumerRules 5)))) +(put 'calc-define 'calc-integrate-numerically + '(progn (define-key calc-mode-map "zn" 'calc-integrate-numerically))) + +(setq calc-highlight-selections-with-faces t + calc-show-selections nil) ;;; Mode settings stored by Calc on Mon Mar 15 16:25:50 2004 (setq calc-group-char " ") (setq calc-frac-format '("/" nil)) (setq calc-date-format '(Www " " D " " Mmmm " " YYYY (", " h ":" mm ":" ss))) -(setq calc-standard-date-formats '("N" "Www Mmm D, YYYY" "YYYY-MM-DD< hh:mm:ss>" "Www Mmm BD< hh:mm:ss> YYYY" "Www D Mmmm YYYY<, h:mm:ss>" "D.M.Y< h:mm:SS>" "M-D-Y< H:mm:SSpp>" "D-M-Y< h:mmCSS>" "j<, h:mm:SS>" "YYddd< hh:mm:ss>")) +(setq calc-standard-date-formats '("N" + "Www Mmm D, YYYY" + "YYYY-MM-DD< hh:mm:ss>" + "Www Mmm BD< hh:mm:ss> YYYY" + "Www D Mmmm YYYY<, h:mm:ss>" + "D.M.Y< h:mm:SS>" + "M-D-Y< H:mm:SSpp>" + "D-M-Y< h:mmCSS>" + "j<, h:mm:SS>" + "YYddd< hh:mm:ss>")) (setq calc-complex-format 'i) (setq calc-previous-modulo '(bigpos 296 967 294 4)) (setq calc-angle-mode 'rad) ;;; End of mode settings -;;; Variable "var-AlgSimpRules" stored by Calc on Thu Jan 6 21:04:23 2000 -(setq var-AlgSimpRules '(vec (calcFunc-assign (+ (^ (calcFunc-sin (var x var-x)) 2) (^ (calcFunc-cos (var x var-x)) 2)) 1) (calcFunc-assign (calcFunc-exp (var x var-x)) (^ (var e var-e) (var x var-x))))) - ;;; Custom units stored by Calc on Thu Mar 18 19:02:50 1999 -(setq math-additional-units '( - (TB "1024 * GB" "Terabyte") - (gig "GB" "Gigabyte") - (GB "1024 * MB" "Gigabyte") - (meg "MB" "Megabyte") - (MB "1024 * kB" "Megabyte") - (KB "kB" "Kilobyte") - (kB "1024 * byte" "Kilobyte") - (Tb "1024 * Gb" "Teraabit") - (Gb "1024 * Mb" "Gigabit") - (Mb "1024 * kb" "Megabit") - (Kb "kb" "Kilobit") - (kb "1024 * bit" "Kilobit") - (byte "octet" "Byte") - (octet "8 * bit" "Octet") - (bit nil "Bit") -)) +(setq math-additional-units + '((EB "1024 * PB" "Exabyte") + (PB "1024 * TB" "Petabyte") + (TB "1024 * GB" "Terabyte") + (gig "GB" "Gigabyte") + (GB "1024 * MB" "Gigabyte") + (meg "MB" "Megabyte") + (MB "1024 * kB" "Megabyte") + (KB "kB" "Kilobyte") + (kB "1024 * byte" "Kilobyte") + (Eb "1024 * Pb" "Exabit") + (Pb "1024 * Tb" "Petabit") + (Tb "1024 * Gb" "Teraabit") + (Gb "1024 * Mb" "Gigabit") + (Mb "1024 * kb" "Megabit") + (Kb "kb" "Kilobit") + (kb "1024 * bit" "Kilobit") + (byte "octet" "Byte") + (octet "8 * bit" "Octet") + (bit nil "Bit"))) ;;; End of custom units +;;; Variable "var-AlgSimpRules" stored by Calc on Thu Jan 6 21:04:23 2000 +(setq var-AlgSimpRules + '(vec (calcFunc-assign + (+ (^ (calcFunc-sin (var x var-x)) 2) + (^ (calcFunc-cos (var x var-x)) 2)) + 1) + (calcFunc-assign + (calcFunc-exp (var x var-x)) + (^ (var e var-e) (var x var-x))))) + ;;; Variable "var-DeMoivre" stored by Calc on Fri Mar 19 16:06:10 1999 -(setq var-DeMoivre '(vec (calcFunc-assign (^ (var e var-e) (var x var-x)) (calcFunc-exp (var x var-x))) (calcFunc-assign (calcFunc-exp (* (var i var-i) (var t var-t))) (calcFunc-evalsimp (+ (calcFunc-cos (var t var-t)) (* (var i var-i) (calcFunc-sin (var t var-t)))))))) +(setq var-DeMoivre + '(vec (calcFunc-assign + (^ (var e var-e) (var x var-x)) + (calcFunc-exp (var x var-x))) + (calcFunc-assign + (calcFunc-exp (* (var i var-i) (var t var-t))) + (calcFunc-evalsimp (+ (calcFunc-cos (var t var-t)) + (* (var i var-i) + (calcFunc-sin (var t var-t)))))))) ;;; Variable "var-TrigDefRules" stored by Calc on Tue Jan 4 13:47:34 2000 -(setq var-TrigDefRules '(vec (calcFunc-phase 1) (calcFunc-assign (calcFunc-sin (var t var-t)) (/ (- (^ (var e var-e) (* (var i var-i) (var t var-t))) (^ (var e var-e) (neg (* (var i var-i) (var t var-t))))) (* 2 (var i var-i)))) (calcFunc-assign (calcFunc-cos (var t var-t)) (/ (+ (^ (var e var-e) (* (var i var-i) (var t var-t))) (^ (var e var-e) (neg (* (var i var-i) (var t var-t))))) 2)) (calcFunc-assign (calcFunc-arcsin (var x var-x)) (* (neg (var i var-i)) (calcFunc-ln (- (* (var i var-i) (var x var-x)) (calcFunc-sqrt (- 1 (^ (var x var-x) 2))))))) (calcFunc-assign (calcFunc-arccos (var x var-x)) (* (neg (var i var-i)) (calcFunc-ln (- (var x var-x) (calcFunc-sqrt (- (^ (var x var-x) 2) 1)))))) (calcFunc-assign (calcFunc-arctan (var x var-x)) (* (frac -1 2) (* (var i var-i) (calcFunc-ln (/ (+ 1 (* (var i var-i) (var x var-x))) (- 1 (* (var i var-i) (var x var-x)))))))) (calcFunc-assign (calcFunc-arctanh (var x var-x)) (* (frac 1 2) (calcFunc-ln (/ (+ 1 (var x var-x)) (- 1 (var x var-x)))))) (calcFunc-phase 2) (calcFunc-assign (calcFunc-tan (var t var-t)) (/ (calcFunc-sin (var t var-t)) (calcFunc-cos (var t var-t)))) (calcFunc-assign (calcFunc-sinh (var t var-t)) (* (neg (var i var-i)) (calcFunc-sin (* (var i var-i) (var t var-t))))) (calcFunc-assign (calcFunc-cosh (var t var-t)) (calcFunc-cos (* (var i var-i) (var t var-t)))) (calcFunc-assign (calcFunc-tanh (var t var-t)) (/ (calcFunc-sinh (var t var-t)) (calcFunc-cosh (var t var-t)))) (calcFunc-assign (calcFunc-arcsinh (var x var-x)) (* (neg (var i var-i)) (calcFunc-arcsin (* (var i var-i) (var x var-x))))) (calcFunc-assign (calcFunc-arccosh (var x var-x)) (* (neg (var i var-i)) (calcFunc-arccos (var x var-x)))))) - -;;; Definition stored by Calc on Tue Jan 4 22:44:33 2000 -(put 'calc-define 'calc-integrate-numerically '(progn - (define-key calc-mode-map "zn" 'calc-integrate-numerically) -)) - -;;; Definition stored by Calc on Tue Jan 4 22:44:37 2000 -(put 'calc-define 'calc-path-length '(progn - (define-key calc-mode-map "zp" 'calc-path-length) -)) +(setq var-TrigDefRules + '(vec (calcFunc-phase 1) + (calcFunc-assign + (calcFunc-sin (var t var-t)) + (/ (- (^ (var e var-e) (* (var i var-i) (var t var-t))) + (^ (var e var-e) (neg (* (var i var-i) (var t var-t))))) + (* 2 (var i var-i)))) + (calcFunc-assign + (calcFunc-cos (var t var-t)) + (/ (+ (^ (var e var-e) (* (var i var-i) (var t var-t))) + (^ (var e var-e) (neg (* (var i var-i) (var t var-t))))) + 2)) + (calcFunc-assign + (calcFunc-arcsin (var x var-x)) + (* (neg (var i var-i)) + (calcFunc-ln (- (* (var i var-i) (var x var-x)) + (calcFunc-sqrt (- 1 + (^ (var x var-x) 2))))))) + (calcFunc-assign + (calcFunc-arccos (var x var-x)) + (* (neg (var i var-i)) + (calcFunc-ln (- (var x var-x) + (calcFunc-sqrt (- (^ (var x var-x) 2) + 1)))))) + (calcFunc-assign + (calcFunc-arctan (var x var-x)) + (* (frac -1 2) + (* (var i var-i) + (calcFunc-ln (/ (+ 1 (* (var i var-i) + (var x var-x))) + (- 1 (* (var i var-i) + (var x var-x)))))))) + (calcFunc-assign + (calcFunc-arctanh (var x var-x)) + (* (frac 1 2) + (calcFunc-ln (/ (+ 1 (var x var-x)) + (- 1 (var x var-x)))))) + + (calcFunc-phase 2) + (calcFunc-assign + (calcFunc-tan (var t var-t)) + (/ (calcFunc-sin (var t var-t)) + (calcFunc-cos (var t var-t)))) + (calcFunc-assign + (calcFunc-sinh (var t var-t)) + (* (neg (var i var-i)) + (calcFunc-sin (* (var i var-i) (var t var-t))))) + (calcFunc-assign + (calcFunc-cosh (var t var-t)) + (calcFunc-cos (* (var i var-i) (var t var-t)))) + (calcFunc-assign + (calcFunc-tanh (var t var-t)) + (/ (calcFunc-sinh (var t var-t)) + (calcFunc-cosh (var t var-t)))) + (calcFunc-assign + (calcFunc-arcsinh (var x var-x)) + (* (neg (var i var-i)) + (calcFunc-arcsin (* (var i var-i) (var x var-x))))) + (calcFunc-assign + (calcFunc-arccosh (var x var-x)) + (* (neg (var i var-i)) (calcFunc-arccos (var x var-x))))))