From 5025cdbcdca9c30c39729859003192a881f2e1a3 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Sat, 25 Jun 2022 12:24:19 +0100 Subject: [PATCH] dot/emacs-calc: Lay out the rulesets properly. --- dot/emacs-calc | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 3 deletions(-) diff --git a/dot/emacs-calc b/dot/emacs-calc index 3487ae5..0cea5a6 100644 --- a/dot/emacs-calc +++ b/dot/emacs-calc @@ -102,10 +102,85 @@ constant bounds." ;;; 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))))) +(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)))))) +(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)))))) -- 2.11.0