Mercurial > emacs
annotate lisp/calc/calc-rules.el @ 57856:df80d19d7a2e
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-660
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-65
Update from CVS
2004-11-01 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-msg.el (gnus-summary-resend-default-address): Add :version.
* lisp/gnus/tls.el (tls-process-connection-type, tls-success)
(tls-certtool-program): Add :version.
* lisp/gnus/starttls.el (starttls-gnutls-program, starttls-use-gnutls)
(starttls-extra-arguments, starttls-process-connection-type)
(starttls-connect, starttls-failure, starttls-success):
* lisp/gnus/spam-stat.el (spam-stat): Add :version.
* lisp/gnus/sieve.el (sieve): Add :version.
* lisp/gnus/sha1.el (sha1): Added :version.
(sha1-use-external): Removed redundant version.
* lisp/gnus/nnmail.el (nnmail-split-fancy-with-parent-ignore-groups)
(nnmail-cache-ignore-groups, nnmail-spool-hook)
(nnmail-split-fancy-match-partial-words)
(nnmail-split-lowercase-expanded):
* lisp/gnus/nndiary.el (nndiary): Add :version.
* lisp/gnus/mml2015.el (mml2015-unabbrev-trust-alist): Add :version.
* lisp/gnus/mml-sec.el (mml-default-sign-method)
(mml-default-encrypt-method, mml-signencrypt-style-alist): Add
:version.
* lisp/gnus/mm-uu.el (mm-uu-diff-groups-regexp): Add :version.
* lisp/gnus/mm-url.el (mm-url-use-external, mm-url-program)
(mm-url-arguments): Add :version.
* lisp/gnus/mm-decode.el (mm-inline-text-html-with-w3m-keymap)
(mm-attachment-file-modes, mm-decrypt-option)
(mm-w3m-safe-url-regexp): Add :version.
* lisp/gnus/message.el (message-cite-prefix-regexp)
(message-sendmail-envelope-from, message-minibuffer-local-map)
(message-user-fqdn, message-completion-alist): Add :version.
* lisp/gnus/gnus-win.el (gnus-configure-windows-hook)
(gnus-use-frames-on-any-display): Add :version.
* lisp/gnus/gnus-art.el (gnus-article-address-banner-alist)
(gnus-treat-unsplit-urls, gnus-treat-unfold-headers)
(gnus-treat-from-picon, gnus-treat-mail-picon)
(gnus-treat-x-pgp-sig): Add :version.
* lisp/gnus/gnus-sum.el (gnus-spam-mark, gnus-recent-mark)
(gnus-undownloaded-mark, gnus-summary-article-move-hook)
(gnus-summary-article-delete-hook)
(gnus-summary-display-while-building): Add :version.
* lisp/gnus/gnus-start.el (gnus-subscribe-newsgroup-hooks)
(gnus-get-top-new-news-hook):Add :version.
* lisp/gnus/gnus-srvr.el (gnus-server-agent-face, gnus-server-opened-face)
(gnus-server-closed-face, gnus-server-denied-face): Add :version.
* lisp/gnus/gnus-registry.el (gnus-registry): Add :version.
* lisp/gnus/gnus-spec.el (gnus-use-correct-string-widths)
(gnus-make-format-preserve-properties): Add :version.
* lisp/gnus/gnus.el (gnus-group-charter-alist)
(gnus-group-fetch-control-use-browse-url)
(gnus-install-group-spam-parameters): Add :version.
* lisp/gnus/gnus-diary.el (gnus-diary): Add :version.
* lisp/gnus/gnus-delay.el (gnus-delay): Add :version.
* lisp/gnus/gnus-cite.el (gnus-cite-unsightly-citation-regexp)
(gnus-cite-ignore-quoted-from, gnus-cite-attribution-face)
(gnus-cite-blank-line-after-header, gnus-article-boring-faces):
Add :version.
* lisp/gnus/gnus-agent.el (gnus-agent-max-fetch-size)
(gnus-agent-enable-expiration, gnus-agent-queue-mail)
(gnus-agent-prompt-send-queue): Add :version.
* lisp/gnus/deuglify.el (gnus-outlook-deuglify): Add :version.
* lisp/gnus/html2text.el: Beautify code. Improve doc strings. Some checkdoc
cleanup.
(html2text-get-attr, html2text-fix-paragraph): Simplify code.
(html2text-format-tag-list): Added "strong" and "em". From
"Alfred M. Szmidt" <ams@kemisten.nu> (tiny change).
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 01 Nov 2004 23:06:36 +0000 |
parents | 695cf19ef79e |
children | f5725a8f81c8 375f2633d815 |
rev | line source |
---|---|
41413 | 1 ;;; calc-rules.el --- rules for simplifying algebraic expressions in Calc |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
2 |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
3 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc. |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
4 |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
5 ;; Author: David Gillespie <daveg@synaptics.com> |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49263
diff
changeset
|
6 ;; Maintainers: D. Goel <deego@gnufans.org> |
49263
f4d68f97221e
Add new maintainer (deego).
Deepak Goel <deego@gnufans.org>
parents:
41413
diff
changeset
|
7 ;; Colin Walters <walters@debian.org> |
40785 | 8 |
9 ;; This file is part of GNU Emacs. | |
10 | |
11 ;; GNU Emacs is distributed in the hope that it will be useful, | |
12 ;; but WITHOUT ANY WARRANTY. No author or distributor | |
13 ;; accepts responsibility to anyone for the consequences of using it | |
14 ;; or for whether it serves any particular purpose or works at all, | |
15 ;; unless he says so in writing. Refer to the GNU Emacs General Public | |
16 ;; License for full details. | |
17 | |
18 ;; Everyone is granted permission to copy, modify and redistribute | |
19 ;; GNU Emacs, but only under the conditions described in the | |
20 ;; GNU Emacs General Public License. A copy of this license is | |
21 ;; supposed to have been given to you along with GNU Emacs so you | |
22 ;; can know your rights and responsibilities. It should be in a | |
23 ;; file named COPYING. Among other things, the copyright notice | |
24 ;; and this notice must be preserved on all copies. | |
25 | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
26 ;;; Commentary: |
40785 | 27 |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
28 ;;; Code: |
40785 | 29 |
30 ;; This file is autoloaded from calc-ext.el. | |
31 (require 'calc-ext) | |
32 | |
33 (require 'calc-macs) | |
34 | |
35 (defun calc-Need-calc-rules () nil) | |
36 | |
37 | |
38 (defun calc-compile-rule-set (name rules) | |
39 (prog2 | |
40 (message "Preparing rule set %s..." name) | |
41 (math-read-plain-expr rules t) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
42 (message "Preparing rule set %s...done" name))) |
40785 | 43 |
44 (defun calc-CommuteRules () | |
45 "CommuteRules" | |
46 (calc-compile-rule-set | |
47 "CommuteRules" "[ | |
48 iterations(1), | |
49 select(plain(a + b)) := select(plain(b + a)), | |
50 select(plain(a - b)) := select(plain((-b) + a)), | |
51 select(plain((1/a) * b)) := select(b / a), | |
52 select(plain(a * b)) := select(b * a), | |
53 select((1/a) / b) := select((1/b) / a), | |
54 select(a / b) := select((1/b) * a), | |
55 select((a^b) ^ c) := select((a^c) ^ b), | |
56 select(log(a, b)) := select(1 / log(b, a)), | |
57 select(plain(a && b)) := select(b && a), | |
58 select(plain(a || b)) := select(b || a), | |
59 select(plain(a = b)) := select(b = a), | |
60 select(plain(a != b)) := select(b != a), | |
61 select(a < b) := select(b > a), | |
62 select(a > b) := select(b < a), | |
63 select(a <= b) := select(b >= a), | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
64 select(a >= b) := select(b <= a) ]")) |
40785 | 65 |
66 (defun calc-JumpRules () | |
67 "JumpRules" | |
68 (calc-compile-rule-set | |
69 "JumpRules" "[ | |
70 iterations(1), | |
71 plain(select(x) = y) := 0 = select(-x) + y, | |
72 plain(a + select(x) = y) := a = select(-x) + y, | |
73 plain(a - select(x) = y) := a = select(x) + y, | |
74 plain(select(x) + a = y) := a = select(-x) + y, | |
75 plain(a * select(x) = y) := a = y / select(x), | |
76 plain(a / select(x) = y) := a = select(x) * y, | |
77 plain(select(x) / a = y) := 1/a = y / select(x), | |
78 plain(a ^ select(2) = y) := a = select(sqrt(y)), | |
79 plain(a ^ select(x) = y) := a = y ^ select(1/x), | |
80 plain(select(x) ^ a = y) := a = log(y, select(x)), | |
81 plain(log(a, select(x)) = y) := a = select(x) ^ y, | |
82 plain(log(select(x), a) = y) := a = select(x) ^ (1/y), | |
83 plain(y = select(x)) := y - select(x) = 0, | |
84 plain(y = a + select(x)) := y - select(x) = a, | |
85 plain(y = a - select(x)) := y + select(x) = a, | |
86 plain(y = select(x) + a) := y - select(x) = a, | |
87 plain(y = a * select(x)) := y / select(x) = a, | |
88 plain(y = a / select(x)) := y * select(x) = a, | |
89 plain(y = select(x) / a) := y / select(x) = 1/a, | |
90 plain(y = a ^ select(2)) := select(sqrt(y)) = a, | |
91 plain(y = a ^ select(x)) := y ^ select(1/x) = a, | |
92 plain(y = select(x) ^ a) := log(y, select(x)) = a, | |
93 plain(y = log(a, select(x))) := select(x) ^ y = a, | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
94 plain(y = log(select(x), a)) := select(x) ^ (1/y) = a ]")) |
40785 | 95 |
96 (defun calc-DistribRules () | |
97 "DistribRules" | |
98 (calc-compile-rule-set | |
99 "DistribRules" "[ | |
100 iterations(1), | |
101 x * select(a + b) := x*select(a) + x*b, | |
102 x * select(sum(a,b,c,d)) := sum(x*select(a),b,c,d), | |
103 x / select(a + b) := 1 / (select(a)/x + b/x), | |
104 select(a + b) / x := select(a)/x + b/x, | |
105 sum(select(a),b,c,d) / x := sum(select(a)/x,b,c,d), | |
106 x ^ select(a + b) := x^select(a) * x^b, | |
107 x ^ select(sum(a,b,c,d)) := prod(x^select(a),b,c,d), | |
108 x ^ select(a * b) := (x^a)^select(b), | |
109 x ^ select(a / b) := (x^a)^select(1/b), | |
110 select(a + b) ^ n := select(x) | |
111 :: integer(n) :: n >= 2 | |
112 :: let(x, expandpow(a+b,n)) | |
113 :: quote(matches(x,y+z)), | |
114 select(a + b) ^ x := a*select(a+b)^(x-1) + b*select(a+b)^(x-1), | |
115 select(a * b) ^ x := a^x * select(b)^x, | |
116 select(prod(a,b,c,d)) ^ x := prod(select(a)^x,b,c,d), | |
117 select(a / b) ^ x := select(a)^x / b^x, | |
118 select(- a) ^ x := (-1)^x * select(a)^x, | |
119 plain(-select(a + b)) := select(-a) - b, | |
120 plain(-select(sum(a,b,c,d))) := sum(select(-a),b,c,d), | |
121 plain(-select(a * b)) := select(-a) * b, | |
122 plain(-select(a / b)) := select(-a) / b, | |
123 sqrt(select(a * b)) := sqrt(select(a)) * sqrt(b), | |
124 sqrt(select(prod(a,b,c,d))) := prod(sqrt(select(a)),b,c,d), | |
125 sqrt(select(a / b)) := sqrt(select(a)) / sqrt(b), | |
126 sqrt(select(- a)) := sqrt(-1) sqrt(select(a)), | |
127 exp(select(a + b)) := exp(select(a)) / exp(-b) :: negative(b), | |
128 exp(select(a + b)) := exp(select(a)) * exp(b), | |
129 exp(select(sum(a,b,c,d))) := prod(exp(select(a)),b,c,d), | |
130 exp(select(a * b)) := exp(select(a)) ^ b :: constant(b), | |
131 exp(select(a * b)) := exp(select(a)) ^ b, | |
132 exp(select(a / b)) := exp(select(a)) ^ (1/b), | |
133 ln(select(a * b)) := ln(select(a)) + ln(b), | |
134 ln(select(prod(a,b,c,d))) := sum(ln(select(a)),b,c,d), | |
135 ln(select(a / b)) := ln(select(a)) - ln(b), | |
136 ln(select(a ^ b)) := ln(select(a)) * b, | |
137 log10(select(a * b)) := log10(select(a)) + log10(b), | |
138 log10(select(prod(a,b,c,d))) := sum(log10(select(a)),b,c,d), | |
139 log10(select(a / b)) := log10(select(a)) - log10(b), | |
140 log10(select(a ^ b)) := log10(select(a)) * b, | |
141 log(select(a * b), x) := log(select(a), x) + log(b,x), | |
142 log(select(prod(a,b,c,d)),x) := sum(log(select(a),x),b,c,d), | |
143 log(select(a / b), x) := log(select(a), x) - log(b,x), | |
144 log(select(a ^ b), x) := log(select(a), x) * b, | |
145 log(a, select(b)) := ln(a) / select(ln(b)), | |
146 sin(select(a + b)) := sin(select(a)) cos(b) + cos(a) sin(b), | |
147 sin(select(2 a)) := 2 sin(select(a)) cos(a), | |
148 sin(select(n a)) := 2sin((n-1) select(a)) cos(a) - sin((n-2) a) | |
149 :: integer(n) :: n > 2, | |
150 cos(select(a + b)) := cos(select(a)) cos(b) - sin(a) sin(b), | |
151 cos(select(2 a)) := 2 cos(select(a))^2 - 1, | |
152 cos(select(n a)) := 2cos((n-1) select(a)) cos(a) - cos((n-2) a) | |
153 :: integer(n) :: n > 2, | |
154 tan(select(a + b)) := (tan(select(a)) + tan(b)) / | |
155 (1 - tan(a) tan(b)), | |
156 tan(select(2 a)) := 2 tan(select(a)) / (1 - tan(a)^2), | |
157 tan(select(n a)) := (tan((n-1) select(a)) + tan(a)) / | |
158 (1 - tan((n-1) a) tan(a)) | |
159 :: integer(n) :: n > 2, | |
160 sinh(select(a + b)) := sinh(select(a)) cosh(b) + cosh(a) sinh(b), | |
161 cosh(select(a + b)) := cosh(select(a)) cosh(b) + sinh(a) sinh(b), | |
162 tanh(select(a + b)) := (tanh(select(a)) + tanh(b)) / | |
163 (1 + tanh(a) tanh(b)), | |
164 x && select(a || b) := (x && select(a)) || (x && b), | |
165 select(a || b) && x := (select(a) && x) || (b && x), | |
166 ! select(a && b) := (!a) || (!b), | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
167 ! select(a || b) := (!a) && (!b) ]")) |
40785 | 168 |
169 (defun calc-MergeRules () | |
170 "MergeRules" | |
171 (calc-compile-rule-set | |
172 "MergeRules" "[ | |
173 iterations(1), | |
174 (x*opt(a)) + select(x*b) := x * (a + select(b)), | |
175 (x*opt(a)) - select(x*b) := x * (a - select(b)), | |
176 sum(select(x)*a,b,c,d) := x * sum(select(a),b,c,d), | |
177 (a/x) + select(b/x) := (a + select(b)) / x, | |
178 (a/x) - select(b/x) := (a - select(b)) / x, | |
179 sum(a/select(x),b,c,d) := sum(select(a),b,c,d) / x, | |
180 (a/opt(b)) + select(c/d) := ((select(a)*d) + (b*c)) / (b*d), | |
181 (a/opt(b)) - select(c/d) := ((select(a)*d) - (b*c)) / (b*d), | |
182 (x^opt(a)) * select(x^b) := x ^ (a + select(b)), | |
183 (x^opt(a)) / select(x^b) := x ^ (a - select(b)), | |
184 select(x^a) / (x^opt(b)) := x ^ (select(a) - b), | |
185 prod(select(x)^a,b,c,d) := x ^ sum(select(a),b,c,d), | |
186 select(x^a) / (x^opt(b)) := x ^ (select(a) - b), | |
187 (a^x) * select(b^x) := select((a * b) ^x), | |
188 (a^x) / select(b^x) := select((b / b) ^ x), | |
189 select(a^x) / (b^x) := select((a / b) ^ x), | |
190 prod(a^select(x),b,c,d) := select(prod(a,b,c,d) ^ x), | |
191 (a^x) * select(b^y) := select((a * b^(y-x)) ^x), | |
192 (a^x) / select(b^y) := select((b / b^(y-x)) ^ x), | |
193 select(a^x) / (b^y) := select((a / b^(y-x)) ^ x), | |
194 select(x^a) ^ b := x ^ select(a * b), | |
195 (x^a) ^ select(b) := x ^ select(a * b), | |
196 select(sqrt(a)) ^ b := select(a ^ (b / 2)), | |
197 sqrt(a) ^ select(b) := select(a ^ (b / 2)), | |
198 sqrt(select(a) ^ b) := select(a ^ (b / 2)), | |
199 sqrt(a ^ select(b)) := select(a ^ (b / 2)), | |
200 sqrt(a) * select(sqrt(b)) := select(sqrt(a * b)), | |
201 sqrt(a) / select(sqrt(b)) := select(sqrt(a / b)), | |
202 select(sqrt(a)) / sqrt(b) := select(sqrt(a / b)), | |
203 prod(select(sqrt(a)),b,c,d) := select(sqrt(prod(a,b,c,d))), | |
204 exp(a) * select(exp(b)) := select(exp(a + b)), | |
205 exp(a) / select(exp(b)) := select(exp(a - b)), | |
206 select(exp(a)) / exp(b) := select(exp(a - b)), | |
207 prod(select(exp(a)),b,c,d) := select(exp(sum(a,b,c,d))), | |
208 select(exp(a)) ^ b := select(exp(a * b)), | |
209 exp(a) ^ select(b) := select(exp(a * b)), | |
210 ln(a) + select(ln(b)) := select(ln(a * b)), | |
211 ln(a) - select(ln(b)) := select(ln(a / b)), | |
212 select(ln(a)) - ln(b) := select(ln(a / b)), | |
213 sum(select(ln(a)),b,c,d) := select(ln(prod(a,b,c,d))), | |
214 b * select(ln(a)) := select(ln(a ^ b)), | |
215 select(b) * ln(a) := select(ln(a ^ b)), | |
216 select(ln(a)) / ln(b) := select(log(a, b)), | |
217 ln(a) / select(ln(b)) := select(log(a, b)), | |
218 select(ln(a)) / b := select(ln(a ^ (1/b))), | |
219 ln(a) / select(b) := select(ln(a ^ (1/b))), | |
220 log10(a) + select(log10(b)) := select(log10(a * b)), | |
221 log10(a) - select(log10(b)) := select(log10(a / b)), | |
222 select(log10(a)) - log10(b) := select(log10(a / b)), | |
223 sum(select(log10(a)),b,c,d) := select(log10(prod(a,b,c,d))), | |
224 b * select(log10(a)) := select(log10(a ^ b)), | |
225 select(b) * log10(a) := select(log10(a ^ b)), | |
226 select(log10(a)) / log10(b) := select(log(a, b)), | |
227 log10(a) / select(log10(b)) := select(log(a, b)), | |
228 select(log10(a)) / b := select(log10(a ^ (1/b))), | |
229 log10(a) / select(b) := select(log10(a ^ (1/b))), | |
230 log(a,x) + select(log(b,x)) := select(log(a * b,x)), | |
231 log(a,x) - select(log(b,x)) := select(log(a / b,x)), | |
232 select(log(a,x)) - log(b,x) := select(log(a / b,x)), | |
233 sum(select(log(a,x)),b,c,d) := select(log(prod(a,b,c,d),x)), | |
234 b * select(log(a,x)) := select(log(a ^ b,x)), | |
235 select(b) * log(a,x) := select(log(a ^ b,x)), | |
236 select(log(a,x)) / log(b,x) := select(log(a, b)), | |
237 log(a,x) / select(log(b,x)) := select(log(a, b)), | |
238 select(log(a,x)) / b := select(log(a ^ (1/b),x)), | |
239 log(a,x) / select(b) := select(log(a ^ (1/b),x)), | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
240 select(x && a) || (x && opt(b)) := x && (select(a) || b) ]")) |
40785 | 241 |
242 (defun calc-NegateRules () | |
243 "NegateRules" | |
244 (calc-compile-rule-set | |
245 "NegateRules" "[ | |
246 iterations(1), | |
247 a + select(x) := a - select(-x), | |
248 a - select(x) := a + select(-x), | |
249 sum(select(x),b,c,d) := -sum(select(-x),b,c,d), | |
250 a * select(x) := -a * select(-x), | |
251 a / select(x) := -a / select(-x), | |
252 select(x) / a := -select(-x) / a, | |
253 prod(select(x),b,c,d) := (-1)^(d-c+1) * prod(select(-x),b,c,d), | |
254 select(x) ^ n := select(-x) ^ a :: integer(n) :: n%2 = 0, | |
255 select(x) ^ n := -(select(-x) ^ a) :: integer(n) :: n%2 = 1, | |
256 select(x) ^ a := (-select(-x)) ^ a, | |
257 a ^ select(x) := (1 / a)^select(-x), | |
258 abs(select(x)) := abs(select(-x)), | |
259 i sqrt(select(x)) := -sqrt(select(-x)), | |
260 sqrt(select(x)) := i sqrt(select(-x)), | |
261 re(select(x)) := -re(select(-x)), | |
262 im(select(x)) := -im(select(-x)), | |
263 conj(select(x)) := -conj(select(-x)), | |
264 trunc(select(x)) := -trunc(select(-x)), | |
265 round(select(x)) := -round(select(-x)), | |
266 floor(select(x)) := -ceil(select(-x)), | |
267 ceil(select(x)) := -floor(select(-x)), | |
268 ftrunc(select(x)) := -ftrunc(select(-x)), | |
269 fround(select(x)) := -fround(select(-x)), | |
270 ffloor(select(x)) := -fceil(select(-x)), | |
271 fceil(select(x)) := -ffloor(select(-x)), | |
272 exp(select(x)) := 1 / exp(select(-x)), | |
273 sin(select(x)) := -sin(select(-x)), | |
274 cos(select(x)) := cos(select(-x)), | |
275 tan(select(x)) := -tan(select(-x)), | |
276 arcsin(select(x)) := -arcsin(select(-x)), | |
277 arccos(select(x)) := 4 arctan(1) - arccos(select(-x)), | |
278 arctan(select(x)) := -arctan(select(-x)), | |
279 sinh(select(x)) := -sinh(select(-x)), | |
280 cosh(select(x)) := cosh(select(-x)), | |
281 tanh(select(x)) := -tanh(select(-x)), | |
282 arcsinh(select(x)) := -arcsinh(select(-x)), | |
283 arctanh(select(x)) := -arctanh(select(-x)), | |
284 select(x) = a := select(-x) = -a, | |
285 select(x) != a := select(-x) != -a, | |
286 select(x) < a := select(-x) > -a, | |
287 select(x) > a := select(-x) < -a, | |
288 select(x) <= a := select(-x) >= -a, | |
289 select(x) >= a := select(-x) <= -a, | |
290 a < select(x) := -a > select(-x), | |
291 a > select(x) := -a < select(-x), | |
292 a <= select(x) := -a >= select(-x), | |
293 a >= select(x) := -a <= select(-x), | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
294 select(x) := -select(-x) ]")) |
40785 | 295 |
296 (defun calc-InvertRules () | |
297 "InvertRules" | |
298 (calc-compile-rule-set | |
299 "InvertRules" "[ | |
300 iterations(1), | |
301 a * select(x) := a / select(1/x), | |
302 a / select(x) := a * select(1/x), | |
303 select(x) / a := 1 / (select(1/x) a), | |
304 prod(select(x),b,c,d) := 1 / prod(select(1/x),b,c,d), | |
305 abs(select(x)) := 1 / abs(select(1/x)), | |
306 sqrt(select(x)) := 1 / sqrt(select(1/x)), | |
307 ln(select(x)) := -ln(select(1/x)), | |
308 log10(select(x)) := -log10(select(1/x)), | |
309 log(select(x), a) := -log(select(1/x), a), | |
310 log(a, select(x)) := -log(a, select(1/x)), | |
311 arctan(select(x)) := simplify(2 arctan(1))-arctan(select(1/x)), | |
312 select(x) = a := select(1/x) = 1/a, | |
313 select(x) != a := select(1/x) != 1/a, | |
314 select(x) < a := select(1/x) > 1/a, | |
315 select(x) > a := select(1/x) < 1/a, | |
316 select(x) <= a := select(1/x) >= 1/a, | |
317 select(x) >= a := select(1/x) <= 1/a, | |
318 a < select(x) := 1/a > select(1/x), | |
319 a > select(x) := 1/a < select(1/x), | |
320 a <= select(x) := 1/a >= select(1/x), | |
321 a >= select(x) := 1/a <= select(1/x), | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
322 select(x) := 1 / select(1/x) ]")) |
40785 | 323 |
324 | |
325 (defun calc-FactorRules () | |
326 "FactorRules" | |
327 (calc-compile-rule-set | |
328 "FactorRules" "[ | |
329 thecoefs(x, [z, a+b, c]) := thefactors(x, [d x + d a/c, (c/d) x + (b/d)]) | |
330 :: z = a b/c :: let(d := pgcd(pcont(c), pcont(b))), | |
331 thecoefs(x, [z, a, c]) := thefactors(x, [(r x + a/(2 r))^2]) | |
332 :: z = (a/2)^2/c :: let(r := esimplify(sqrt(c))) | |
333 :: !matches(r, sqrt(rr)), | |
334 thecoefs(x, [z, 0, c]) := thefactors(x, [rc x + rz, rc x - rz]) | |
335 :: negative(z) | |
336 :: let(rz := esimplify(sqrt(-z))) :: !matches(rz, sqrt(rzz)) | |
337 :: let(rc := esimplify(sqrt(c))) :: !matches(rc, sqrt(rcc)), | |
338 thecoefs(x, [z, 0, c]) := thefactors(x, [rz + rc x, rz - rc x]) | |
339 :: negative(c) | |
340 :: let(rz := esimplify(sqrt(z))) :: !matches(rz, sqrt(rzz)) | |
341 :: let(rc := esimplify(sqrt(-c))) :: !matches(rc, sqrt(rcc)) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
342 ]")) |
40785 | 343 ;;(setq var-FactorRules 'calc-FactorRules) |
344 | |
345 | |
346 (defun calc-IntegAfterRules () | |
347 "IntegAfterRules" | |
348 (calc-compile-rule-set | |
349 "IntegAfterRules" "[ | |
350 opt(a) ln(x) + opt(b) ln(y) := 2 a esimplify(arctanh(x-1)) | |
351 :: a + b = 0 :: nrat(x + y) = 2 || nrat(x - y) = 2, | |
352 a * (b + c) := a b + a c :: constant(a) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
353 ]")) |
40785 | 354 |
355 ;;(setq var-IntegAfterRules 'calc-IntegAfterRules) | |
356 | |
357 | |
358 (defun calc-FitRules () | |
359 "FitRules" | |
360 (calc-compile-rule-set | |
361 "FitRules" "[ | |
362 | |
363 schedule(1,2,3,4), | |
364 iterations(inf), | |
365 | |
366 phase(1), | |
367 e^x := exp(x), | |
368 x^y := exp(y ln(x)) :: !istrue(constant(y)), | |
369 x/y := x fitinv(y), | |
370 fitinv(x y) := fitinv(x) fitinv(y), | |
371 exp(a) exp(b) := exp(a + b), | |
372 a exp(b) := exp(ln(a) + b) :: !hasfitvars(a), | |
373 fitinv(exp(a)) := exp(-a), | |
374 ln(a b) := ln(a) + ln(b), | |
375 ln(fitinv(a)) := -ln(a), | |
376 log10(a b) := log10(a) + log10(b), | |
377 log10(fitinv(a)) := -log10(a), | |
378 log(a,b) := ln(a)/ln(b), | |
379 ln(exp(a)) := a, | |
380 a*(b+c) := a*b + a*c, | |
381 (a+b)^n := x :: integer(n) :: n >= 2 | |
382 :: let(x, expandpow(a+b,n)) | |
383 :: quote(matches(x,y+z)), | |
384 | |
385 phase(1,2), | |
386 fitmodel(y = x) := fitmodel(0, y - x), | |
387 fitmodel(y, x+c) := fitmodel(y-c, x) :: !hasfitparams(c), | |
388 fitmodel(y, x c) := fitmodel(y/c, x) :: !hasfitparams(c), | |
389 fitmodel(y, x/(c opt(d))) := fitmodel(y c, x/d) :: !hasfitparams(c), | |
390 fitmodel(y, apply(f,[x])) := fitmodel(yy, x) | |
391 :: hasfitparams(x) | |
392 :: let(FTemp() = yy, | |
393 solve(apply(f,[FTemp()]) = y, | |
394 FTemp())), | |
395 fitmodel(y, apply(f,[x,c])) := fitmodel(yy, x) | |
396 :: !hasfitparams(c) | |
397 :: let(FTemp() = yy, | |
398 solve(apply(f,[FTemp(),c]) = y, | |
399 FTemp())), | |
400 fitmodel(y, apply(f,[c,x])) := fitmodel(yy, x) | |
401 :: !hasfitparams(c) | |
402 :: let(FTemp() = yy, | |
403 solve(apply(f,[c,FTemp()]) = y, | |
404 FTemp())), | |
405 | |
406 phase(2,3), | |
407 fitmodel(y, x) := fitsystem(y, [], [], fitpart(1,1,x)), | |
408 fitpart(a,b,plain(x + y)) := fitpart(a,b,x) + fitpart(a,b,y), | |
409 fitpart(a,b,plain(x - y)) := fitpart(a,b,x) + fitpart(-a,b,y), | |
410 fitpart(a,b,plain(-x)) := fitpart(-a,b,x), | |
411 fitpart(a,b,x opt(c)) := fitpart(a,x b,c) :: !hasfitvars(x), | |
412 fitpart(a,x opt(b),c) := fitpart(x a,b,c) :: !hasfitparams(x), | |
413 fitpart(a,x y + x opt(z),c) := fitpart(a,x*(y+z),c), | |
414 fitpart(a,b,c) := fitpart2(a,b,c), | |
415 | |
416 phase(3), | |
417 fitpart2(a1,b1,x) + fitpart2(a2,b2,x) := fitpart(1, a1 b1 + a2 b2, x), | |
418 fitpart2(a1,x,c1) + fitpart2(a2,x,c2) := fitpart2(1, x, a1 c1 + a2 c2), | |
419 | |
420 phase(4), | |
421 fitinv(x) := 1 / x, | |
422 exp(x + ln(y)) := y exp(x), | |
423 exp(x ln(y)) := y^x, | |
424 ln(x) + ln(y) := ln(x y), | |
425 ln(x) - ln(y) := ln(x/y), | |
426 x*y + x*z := x*(y+z), | |
427 fitsystem(y, xv, pv, fitpart2(a,fitparam(b),c) + opt(d)) | |
428 := fitsystem(y, rcons(xv, a c), | |
429 rcons(pv, fitdummy(b) = fitparam(b)), d) | |
430 :: b = vlen(pv)+1, | |
431 fitsystem(y, xv, pv, fitpart2(a,b,c) + opt(d)) | |
432 := fitsystem(y, rcons(xv, a c), | |
433 rcons(pv, fitdummy(vlen(pv)+1) = b), d), | |
434 fitsystem(y, xv, pv, 0) := fitsystem(y, xv, cons(fvh,fvt)) | |
435 :: !hasfitparams(xv) | |
436 :: let(cons(fvh,fvt), | |
437 solve(pv, table(fitparam(j), j, 1, | |
438 hasfitparams(pv)))), | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
439 fitparam(n) = x := x ]")) |
40785 | 440 |
52401 | 441 ;;; arch-tag: 0ed54a52-38f3-4ed7-9ca7-b8ecf8f2febe |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
442 ;;; calc-rules.el ends here |