Mercurial > emacs
annotate lisp/calc/calc-math.el @ 82232:58ac5a791dfa
* vc.el: Document new VC operation `extra-menu'.
* vc-hooks.el (vc-default-extra-menu): New function.
* menu-bar.el (menu-bar-vc-filter): New function.
(menu-bar-tools-menu): Use it as a filter.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Wed, 01 Aug 2007 17:13:45 +0000 |
parents | b98604865ea0 |
children | 78ac1f6cc5cc f55f9811f5d7 |
rev | line source |
---|---|
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41044
diff
changeset
|
1 ;;; calc-math.el --- mathematical functions for Calc |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41044
diff
changeset
|
2 |
64325
1db49616ce05
Update copyright information.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
62165
diff
changeset
|
3 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, |
75346 | 4 ;; 2005, 2006, 2007 Free Software Foundation, Inc. |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41044
diff
changeset
|
5 |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41044
diff
changeset
|
6 ;; Author: David Gillespie <daveg@synaptics.com> |
77465
1154f082efd9
Update maintainer's address.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
76595
diff
changeset
|
7 ;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com> |
40785 | 8 |
9 ;; This file is part of GNU Emacs. | |
10 | |
76595
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
11 ;; GNU Emacs is free software; you can redistribute it and/or modify |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
12 ;; it under the terms of the GNU General Public License as published by |
78215
095d08e7d6bb
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
77465
diff
changeset
|
13 ;; the Free Software Foundation; either version 3, or (at your option) |
76595
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
14 ;; any later version. |
40785 | 15 |
76595
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
16 ;; GNU Emacs is distributed in the hope that it will be useful, |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
19 ;; GNU General Public License for more details. |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
20 |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
21 ;; You should have received a copy of the GNU General Public License |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
24 ;; Boston, MA 02110-1301, USA. |
40785 | 25 |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41044
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:
41044
diff
changeset
|
28 ;;; Code: |
40785 | 29 |
30 ;; This file is autoloaded from calc-ext.el. | |
58663
7ed196c06460
Add a provide statement.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58475
diff
changeset
|
31 |
40785 | 32 (require 'calc-ext) |
33 (require 'calc-macs) | |
34 | |
82015
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
35 |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
36 ;;; Find out how many 9s in 9.9999... will give distinct Emacs floats, |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
37 ;;; then back off by one. |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
38 |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
39 (defvar math-emacs-precision |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
40 (let* ((n 1) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
41 (x 9) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
42 (xx (+ x (* 9 (expt 10 (- n)))))) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
43 (while (/= x xx) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
44 (progn |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
45 (setq n (1+ n)) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
46 (setq x xx) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
47 (setq xx (+ x (* 9 (expt 10 (- n))))))) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
48 (1- n)) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
49 "The number of digits in an Emacs float.") |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
50 |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
51 ;;; Find the largest power of 10 which is an Emacs float, |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
52 ;;; then back off by one so that any float d.dddd...eN |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
53 ;;; is an Emacs float, for acceptable d.dddd.... |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
54 |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
55 (defvar math-largest-emacs-expt |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
56 (let ((x 1)) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
57 (while (condition-case nil |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
58 (expt 10.0 x) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
59 (error nil)) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
60 (setq x (* 2 x))) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
61 (setq x (/ x 2)) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
62 (while (condition-case nil |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
63 (expt 10.0 x) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
64 (error nil)) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
65 (setq x (1+ x))) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
66 (- x 2)) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
67 "The largest exponent which Calc will convert to an Emacs float.") |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
68 |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
69 (defvar math-smallest-emacs-expt |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
70 (let ((x -1)) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
71 (while (condition-case nil |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
72 (expt 10.0 x) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
73 (error nil)) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
74 (setq x (* 2 x))) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
75 (setq x (/ x 2)) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
76 (while (condition-case nil |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
77 (expt 10.0 x) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
78 (error nil)) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
79 (setq x (1- x))) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
80 (+ x 2)) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
81 "The smallest exponent which Calc will convert to an Emacs float.") |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
82 |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
83 (defun math-use-emacs-fn (fn x) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
84 "Use the native Emacs function FN to evaluate the Calc number X. |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
85 If this can't be done, return NIL." |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
86 (and |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
87 (<= calc-internal-prec math-emacs-precision) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
88 (math-realp x) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
89 (let* ((fx (math-float x)) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
90 (xpon (+ (nth 2 x) (1- (math-numdigs (nth 1 x)))))) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
91 (and (<= math-smallest-emacs-expt xpon) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
92 (<= xpon math-largest-emacs-expt) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
93 (condition-case nil |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
94 (math-read-number |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
95 (number-to-string |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
96 (funcall fn |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
97 (string-to-number (math-format-number (math-float x)))))) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
98 (error nil)))))) |
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
99 |
40785 | 100 (defun calc-sqrt (arg) |
101 (interactive "P") | |
102 (calc-slow-wrapper | |
103 (if (calc-is-inverse) | |
104 (calc-unary-op "^2" 'calcFunc-sqr arg) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
105 (calc-unary-op "sqrt" 'calcFunc-sqrt arg)))) |
40785 | 106 |
107 (defun calc-isqrt (arg) | |
108 (interactive "P") | |
109 (calc-slow-wrapper | |
110 (if (calc-is-inverse) | |
111 (calc-unary-op "^2" 'calcFunc-sqr arg) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
112 (calc-unary-op "isqt" 'calcFunc-isqrt arg)))) |
40785 | 113 |
114 | |
115 (defun calc-hypot (arg) | |
116 (interactive "P") | |
117 (calc-slow-wrapper | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
118 (calc-binary-op "hypt" 'calcFunc-hypot arg))) |
40785 | 119 |
120 (defun calc-ln (arg) | |
121 (interactive "P") | |
122 (calc-invert-func) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
123 (calc-exp arg)) |
40785 | 124 |
125 (defun calc-log10 (arg) | |
126 (interactive "P") | |
127 (calc-hyperbolic-func) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
128 (calc-ln arg)) |
40785 | 129 |
130 (defun calc-log (arg) | |
131 (interactive "P") | |
132 (calc-slow-wrapper | |
133 (if (calc-is-inverse) | |
134 (calc-binary-op "alog" 'calcFunc-alog arg) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
135 (calc-binary-op "log" 'calcFunc-log arg)))) |
40785 | 136 |
137 (defun calc-ilog (arg) | |
138 (interactive "P") | |
139 (calc-slow-wrapper | |
140 (if (calc-is-inverse) | |
141 (calc-binary-op "alog" 'calcFunc-alog arg) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
142 (calc-binary-op "ilog" 'calcFunc-ilog arg)))) |
40785 | 143 |
144 (defun calc-lnp1 (arg) | |
145 (interactive "P") | |
146 (calc-invert-func) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
147 (calc-expm1 arg)) |
40785 | 148 |
149 (defun calc-exp (arg) | |
150 (interactive "P") | |
151 (calc-slow-wrapper | |
152 (if (calc-is-hyperbolic) | |
153 (if (calc-is-inverse) | |
154 (calc-unary-op "lg10" 'calcFunc-log10 arg) | |
155 (calc-unary-op "10^" 'calcFunc-exp10 arg)) | |
156 (if (calc-is-inverse) | |
157 (calc-unary-op "ln" 'calcFunc-ln arg) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
158 (calc-unary-op "exp" 'calcFunc-exp arg))))) |
40785 | 159 |
160 (defun calc-expm1 (arg) | |
161 (interactive "P") | |
162 (calc-slow-wrapper | |
163 (if (calc-is-inverse) | |
164 (calc-unary-op "ln+1" 'calcFunc-lnp1 arg) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
165 (calc-unary-op "ex-1" 'calcFunc-expm1 arg)))) |
40785 | 166 |
167 (defun calc-pi () | |
168 (interactive) | |
169 (calc-slow-wrapper | |
170 (if (calc-is-inverse) | |
171 (if (calc-is-hyperbolic) | |
172 (if calc-symbolic-mode | |
173 (calc-pop-push-record 0 "phi" '(var phi var-phi)) | |
174 (calc-pop-push-record 0 "phi" (math-phi))) | |
175 (if calc-symbolic-mode | |
176 (calc-pop-push-record 0 "gmma" '(var gamma var-gamma)) | |
177 (calc-pop-push-record 0 "gmma" (math-gamma-const)))) | |
178 (if (calc-is-hyperbolic) | |
179 (if calc-symbolic-mode | |
180 (calc-pop-push-record 0 "e" '(var e var-e)) | |
181 (calc-pop-push-record 0 "e" (math-e))) | |
182 (if calc-symbolic-mode | |
183 (calc-pop-push-record 0 "pi" '(var pi var-pi)) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
184 (calc-pop-push-record 0 "pi" (math-pi))))))) |
40785 | 185 |
186 (defun calc-sin (arg) | |
187 (interactive "P") | |
188 (calc-slow-wrapper | |
189 (if (calc-is-hyperbolic) | |
190 (if (calc-is-inverse) | |
191 (calc-unary-op "asnh" 'calcFunc-arcsinh arg) | |
192 (calc-unary-op "sinh" 'calcFunc-sinh arg)) | |
193 (if (calc-is-inverse) | |
194 (calc-unary-op "asin" 'calcFunc-arcsin arg) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
195 (calc-unary-op "sin" 'calcFunc-sin arg))))) |
40785 | 196 |
197 (defun calc-arcsin (arg) | |
198 (interactive "P") | |
199 (calc-invert-func) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
200 (calc-sin arg)) |
40785 | 201 |
202 (defun calc-sinh (arg) | |
203 (interactive "P") | |
204 (calc-hyperbolic-func) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
205 (calc-sin arg)) |
40785 | 206 |
207 (defun calc-arcsinh (arg) | |
208 (interactive "P") | |
209 (calc-invert-func) | |
210 (calc-hyperbolic-func) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
211 (calc-sin arg)) |
40785 | 212 |
60079
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
213 (defun calc-sec (arg) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
214 (interactive "P") |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
215 (calc-slow-wrapper |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
216 (if (calc-is-hyperbolic) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
217 (calc-unary-op "sech" 'calcFunc-sech arg) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
218 (calc-unary-op "sec" 'calcFunc-sec arg)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
219 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
220 (defun calc-sech (arg) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
221 (interactive "P") |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
222 (calc-hyperbolic-func) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
223 (calc-sec arg)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
224 |
40785 | 225 (defun calc-cos (arg) |
226 (interactive "P") | |
227 (calc-slow-wrapper | |
228 (if (calc-is-hyperbolic) | |
229 (if (calc-is-inverse) | |
230 (calc-unary-op "acsh" 'calcFunc-arccosh arg) | |
231 (calc-unary-op "cosh" 'calcFunc-cosh arg)) | |
232 (if (calc-is-inverse) | |
233 (calc-unary-op "acos" 'calcFunc-arccos arg) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
234 (calc-unary-op "cos" 'calcFunc-cos arg))))) |
40785 | 235 |
236 (defun calc-arccos (arg) | |
237 (interactive "P") | |
238 (calc-invert-func) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
239 (calc-cos arg)) |
40785 | 240 |
241 (defun calc-cosh (arg) | |
242 (interactive "P") | |
243 (calc-hyperbolic-func) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
244 (calc-cos arg)) |
40785 | 245 |
246 (defun calc-arccosh (arg) | |
247 (interactive "P") | |
248 (calc-invert-func) | |
249 (calc-hyperbolic-func) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
250 (calc-cos arg)) |
40785 | 251 |
60079
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
252 (defun calc-csc (arg) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
253 (interactive "P") |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
254 (calc-slow-wrapper |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
255 (if (calc-is-hyperbolic) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
256 (calc-unary-op "csch" 'calcFunc-csch arg) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
257 (calc-unary-op "csc" 'calcFunc-csc arg)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
258 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
259 (defun calc-csch (arg) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
260 (interactive "P") |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
261 (calc-hyperbolic-func) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
262 (calc-csc arg)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
263 |
40785 | 264 (defun calc-sincos () |
265 (interactive) | |
266 (calc-slow-wrapper | |
267 (if (calc-is-inverse) | |
268 (calc-enter-result 1 "asnc" (list 'calcFunc-arcsincos (calc-top-n 1))) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
269 (calc-enter-result 1 "sncs" (list 'calcFunc-sincos (calc-top-n 1)))))) |
40785 | 270 |
271 (defun calc-tan (arg) | |
272 (interactive "P") | |
273 (calc-slow-wrapper | |
274 (if (calc-is-hyperbolic) | |
275 (if (calc-is-inverse) | |
276 (calc-unary-op "atnh" 'calcFunc-arctanh arg) | |
277 (calc-unary-op "tanh" 'calcFunc-tanh arg)) | |
278 (if (calc-is-inverse) | |
279 (calc-unary-op "atan" 'calcFunc-arctan arg) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
280 (calc-unary-op "tan" 'calcFunc-tan arg))))) |
40785 | 281 |
282 (defun calc-arctan (arg) | |
283 (interactive "P") | |
284 (calc-invert-func) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
285 (calc-tan arg)) |
40785 | 286 |
287 (defun calc-tanh (arg) | |
288 (interactive "P") | |
289 (calc-hyperbolic-func) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
290 (calc-tan arg)) |
40785 | 291 |
292 (defun calc-arctanh (arg) | |
293 (interactive "P") | |
294 (calc-invert-func) | |
295 (calc-hyperbolic-func) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
296 (calc-tan arg)) |
40785 | 297 |
60079
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
298 (defun calc-cot (arg) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
299 (interactive "P") |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
300 (calc-slow-wrapper |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
301 (if (calc-is-hyperbolic) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
302 (calc-unary-op "coth" 'calcFunc-coth arg) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
303 (calc-unary-op "cot" 'calcFunc-cot arg)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
304 |
60164
697e2ba683cc
(calc-arctan, calc-tanh, calc-arctanh): Removed extra definitions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
60085
diff
changeset
|
305 (defun calc-coth (arg) |
60079
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
306 (interactive "P") |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
307 (calc-hyperbolic-func) |
60164
697e2ba683cc
(calc-arctan, calc-tanh, calc-arctanh): Removed extra definitions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
60085
diff
changeset
|
308 (calc-cot arg)) |
60079
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
309 |
40785 | 310 (defun calc-arctan2 () |
311 (interactive) | |
312 (calc-slow-wrapper | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
313 (calc-enter-result 2 "atn2" (cons 'calcFunc-arctan2 (calc-top-list-n 2))))) |
40785 | 314 |
315 (defun calc-conj (arg) | |
316 (interactive "P") | |
317 (calc-wrapper | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
318 (calc-unary-op "conj" 'calcFunc-conj arg))) |
40785 | 319 |
320 (defun calc-imaginary () | |
321 (interactive) | |
322 (calc-slow-wrapper | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
323 (calc-pop-push-record 1 "i*" (math-imaginary (calc-top-n 1))))) |
40785 | 324 |
325 (defun calc-to-degrees (arg) | |
326 (interactive "P") | |
327 (calc-wrapper | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
328 (calc-unary-op ">deg" 'calcFunc-deg arg))) |
40785 | 329 |
330 (defun calc-to-radians (arg) | |
331 (interactive "P") | |
332 (calc-wrapper | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
333 (calc-unary-op ">rad" 'calcFunc-rad arg))) |
40785 | 334 |
335 | |
336 (defun calc-degrees-mode (arg) | |
337 (interactive "p") | |
338 (cond ((= arg 1) | |
339 (calc-wrapper | |
340 (calc-change-mode 'calc-angle-mode 'deg) | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41044
diff
changeset
|
341 (message "Angles measured in degrees"))) |
40785 | 342 ((= arg 2) (calc-radians-mode)) |
343 ((= arg 3) (calc-hms-mode)) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
344 (t (error "Prefix argument out of range")))) |
40785 | 345 |
346 (defun calc-radians-mode () | |
347 (interactive) | |
348 (calc-wrapper | |
349 (calc-change-mode 'calc-angle-mode 'rad) | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41044
diff
changeset
|
350 (message "Angles measured in radians"))) |
40785 | 351 |
352 | |
353 ;;; Compute the integer square-root floor(sqrt(A)). A > 0. [I I] [Public] | |
354 ;;; This method takes advantage of the fact that Newton's method starting | |
355 ;;; with an overestimate always works, even using truncating integer division! | |
356 (defun math-isqrt (a) | |
357 (cond ((Math-zerop a) a) | |
358 ((not (math-natnump a)) | |
359 (math-reject-arg a 'natnump)) | |
360 ((integerp a) | |
361 (math-isqrt-small a)) | |
362 (t | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
363 (math-normalize (cons 'bigpos (cdr (math-isqrt-bignum (cdr a)))))))) |
40785 | 364 |
365 (defun calcFunc-isqrt (a) | |
366 (if (math-realp a) | |
367 (math-isqrt (math-floor a)) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
368 (math-floor (math-sqrt a)))) |
40785 | 369 |
370 | |
42206 | 371 ;;; This returns (flag . result) where the flag is t if A is a perfect square. |
40785 | 372 (defun math-isqrt-bignum (a) ; [P.l L] |
373 (let ((len (length a))) | |
374 (if (= (% len 2) 0) | |
375 (let* ((top (nthcdr (- len 2) a))) | |
376 (math-isqrt-bignum-iter | |
377 a | |
81597
4894ac2fb62c
(math-scale-bignum-digit-size): Renamed from math-scale-bignum-3.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81549
diff
changeset
|
378 (math-scale-bignum-digit-size |
40785 | 379 (math-bignum-big |
380 (1+ (math-isqrt-small | |
81597
4894ac2fb62c
(math-scale-bignum-digit-size): Renamed from math-scale-bignum-3.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81549
diff
changeset
|
381 (+ (* (nth 1 top) math-bignum-digit-size) (car top))))) |
40785 | 382 (1- (/ len 2))))) |
383 (let* ((top (nth (1- len) a))) | |
384 (math-isqrt-bignum-iter | |
385 a | |
81597
4894ac2fb62c
(math-scale-bignum-digit-size): Renamed from math-scale-bignum-3.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81549
diff
changeset
|
386 (math-scale-bignum-digit-size |
40785 | 387 (list (1+ (math-isqrt-small top))) |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
388 (/ len 2))))))) |
40785 | 389 |
390 (defun math-isqrt-bignum-iter (a guess) ; [l L l] | |
391 (math-working "isqrt" (cons 'bigpos guess)) | |
392 (let* ((q (math-div-bignum a guess)) | |
393 (s (math-add-bignum (car q) guess)) | |
394 (g2 (math-div2-bignum s)) | |
395 (comp (math-compare-bignum g2 guess))) | |
396 (if (< comp 0) | |
397 (math-isqrt-bignum-iter a g2) | |
398 (cons (and (= comp 0) | |
399 (math-zerop-bignum (cdr q)) | |
400 (= (% (car s) 2) 0)) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
401 guess)))) |
40785 | 402 |
403 (defun math-zerop-bignum (a) | |
404 (and (eq (car a) 0) | |
405 (progn | |
406 (while (eq (car (setq a (cdr a))) 0)) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
407 (null a)))) |
40785 | 408 |
81597
4894ac2fb62c
(math-scale-bignum-digit-size): Renamed from math-scale-bignum-3.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81549
diff
changeset
|
409 (defun math-scale-bignum-digit-size (a n) ; [L L S] |
40785 | 410 (while (> n 0) |
411 (setq a (cons 0 a) | |
412 n (1- n))) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
413 a) |
40785 | 414 |
415 (defun math-isqrt-small (a) ; A > 0. [S S] | |
81597
4894ac2fb62c
(math-scale-bignum-digit-size): Renamed from math-scale-bignum-3.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81549
diff
changeset
|
416 (let ((g (cond ((>= a 1000000) 10000) |
4894ac2fb62c
(math-scale-bignum-digit-size): Renamed from math-scale-bignum-3.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81549
diff
changeset
|
417 ((>= a 10000) 1000) |
40785 | 418 ((>= a 100) 100) |
419 (t 10))) | |
420 g2) | |
421 (while (< (setq g2 (/ (+ g (/ a g)) 2)) g) | |
422 (setq g g2)) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
423 g)) |
40785 | 424 |
425 | |
426 | |
427 | |
428 ;;; Compute the square root of a number. | |
429 ;;; [T N] if possible, else [F N] if possible, else [C N]. [Public] | |
430 (defun math-sqrt (a) | |
431 (or | |
432 (and (Math-zerop a) a) | |
433 (and (math-known-nonposp a) | |
434 (math-imaginary (math-sqrt (math-neg a)))) | |
435 (and (integerp a) | |
436 (let ((sqrt (math-isqrt-small a))) | |
437 (if (= (* sqrt sqrt) a) | |
438 sqrt | |
439 (if calc-symbolic-mode | |
440 (list 'calcFunc-sqrt a) | |
441 (math-sqrt-float (math-float a) (math-float sqrt)))))) | |
442 (and (eq (car-safe a) 'bigpos) | |
443 (let* ((res (math-isqrt-bignum (cdr a))) | |
444 (sqrt (math-normalize (cons 'bigpos (cdr res))))) | |
445 (if (car res) | |
446 sqrt | |
447 (if calc-symbolic-mode | |
448 (list 'calcFunc-sqrt a) | |
449 (math-sqrt-float (math-float a) (math-float sqrt)))))) | |
450 (and (eq (car-safe a) 'frac) | |
451 (let* ((num-res (math-isqrt-bignum (cdr (Math-bignum-test (nth 1 a))))) | |
452 (num-sqrt (math-normalize (cons 'bigpos (cdr num-res)))) | |
453 (den-res (math-isqrt-bignum (cdr (Math-bignum-test (nth 2 a))))) | |
454 (den-sqrt (math-normalize (cons 'bigpos (cdr den-res))))) | |
455 (if (and (car num-res) (car den-res)) | |
456 (list 'frac num-sqrt den-sqrt) | |
457 (if calc-symbolic-mode | |
458 (if (or (car num-res) (car den-res)) | |
459 (math-div (if (car num-res) | |
460 num-sqrt (list 'calcFunc-sqrt (nth 1 a))) | |
461 (if (car den-res) | |
462 den-sqrt (list 'calcFunc-sqrt (nth 2 a)))) | |
463 (list 'calcFunc-sqrt a)) | |
464 (math-sqrt-float (math-float a) | |
465 (math-div (math-float num-sqrt) den-sqrt)))))) | |
466 (and (eq (car-safe a) 'float) | |
467 (if calc-symbolic-mode | |
468 (if (= (% (nth 2 a) 2) 0) | |
469 (let ((res (math-isqrt-bignum | |
470 (cdr (Math-bignum-test (nth 1 a)))))) | |
471 (if (car res) | |
472 (math-make-float (math-normalize | |
473 (cons 'bigpos (cdr res))) | |
474 (/ (nth 2 a) 2)) | |
475 (signal 'inexact-result nil))) | |
476 (signal 'inexact-result nil)) | |
477 (math-sqrt-float a))) | |
478 (and (eq (car-safe a) 'cplx) | |
479 (math-with-extra-prec 2 | |
480 (let* ((d (math-abs a)) | |
481 (imag (math-sqrt (math-mul (math-sub d (nth 1 a)) | |
482 '(float 5 -1))))) | |
483 (list 'cplx | |
484 (math-sqrt (math-mul (math-add d (nth 1 a)) '(float 5 -1))) | |
485 (if (math-negp (nth 2 a)) (math-neg imag) imag))))) | |
486 (and (eq (car-safe a) 'polar) | |
487 (list 'polar | |
488 (math-sqrt (nth 1 a)) | |
489 (math-mul (nth 2 a) '(float 5 -1)))) | |
490 (and (eq (car-safe a) 'sdev) | |
491 (let ((sqrt (math-sqrt (nth 1 a)))) | |
492 (math-make-sdev sqrt | |
493 (math-div (nth 2 a) (math-mul sqrt 2))))) | |
494 (and (eq (car-safe a) 'intv) | |
495 (not (math-negp (nth 2 a))) | |
496 (math-make-intv (nth 1 a) (math-sqrt (nth 2 a)) (math-sqrt (nth 3 a)))) | |
497 (and (eq (car-safe a) '*) | |
498 (or (math-known-nonnegp (nth 1 a)) | |
499 (math-known-nonnegp (nth 2 a))) | |
500 (math-mul (math-sqrt (nth 1 a)) (math-sqrt (nth 2 a)))) | |
501 (and (eq (car-safe a) '/) | |
502 (or (and (math-known-nonnegp (nth 2 a)) | |
503 (math-div (math-sqrt (nth 1 a)) (math-sqrt (nth 2 a)))) | |
504 (and (math-known-nonnegp (nth 1 a)) | |
505 (not (math-equal-int (nth 1 a) 1)) | |
506 (math-mul (math-sqrt (nth 1 a)) | |
507 (math-sqrt (math-div 1 (nth 2 a))))))) | |
508 (and (eq (car-safe a) '^) | |
509 (math-known-evenp (nth 2 a)) | |
510 (math-known-realp (nth 1 a)) | |
511 (math-abs (math-pow (nth 1 a) (math-div (nth 2 a) 2)))) | |
512 (let ((inf (math-infinitep a))) | |
513 (and inf | |
514 (math-mul (math-sqrt (math-infinite-dir a inf)) inf))) | |
515 (progn | |
516 (calc-record-why 'numberp a) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
517 (list 'calcFunc-sqrt a)))) |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41044
diff
changeset
|
518 (defalias 'calcFunc-sqrt 'math-sqrt) |
40785 | 519 |
520 (defun math-infinite-dir (a &optional inf) | |
521 (or inf (setq inf (math-infinitep a))) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
522 (math-normalize (math-expr-subst a inf 1))) |
40785 | 523 |
524 (defun math-sqrt-float (a &optional guess) ; [F F F] | |
525 (if calc-symbolic-mode | |
526 (signal 'inexact-result nil) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
527 (math-with-extra-prec 1 (math-sqrt-raw a guess)))) |
40785 | 528 |
529 (defun math-sqrt-raw (a &optional guess) ; [F F F] | |
530 (if (not (Math-posp a)) | |
531 (math-sqrt a) | |
532 (if (null guess) | |
533 (let ((ldiff (- (math-numdigs (nth 1 a)) 6))) | |
534 (or (= (% (+ (nth 2 a) ldiff) 2) 0) (setq ldiff (1+ ldiff))) | |
535 (setq guess (math-make-float (math-isqrt-small | |
536 (math-scale-int (nth 1 a) (- ldiff))) | |
537 (/ (+ (nth 2 a) ldiff) 2))))) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
538 (math-sqrt-float-iter a guess))) |
40785 | 539 |
540 (defun math-sqrt-float-iter (a guess) ; [F F F] | |
541 (math-working "sqrt" guess) | |
542 (let ((g2 (math-mul-float (math-add-float guess (math-div-float a guess)) | |
543 '(float 5 -1)))) | |
544 (if (math-nearly-equal-float g2 guess) | |
545 g2 | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
546 (math-sqrt-float-iter a g2)))) |
40785 | 547 |
548 ;;; True if A and B differ only in the last digit of precision. [P F F] | |
549 (defun math-nearly-equal-float (a b) | |
550 (let ((ediff (- (nth 2 a) (nth 2 b)))) | |
551 (cond ((= ediff 0) ;; Expanded out for speed | |
552 (setq ediff (math-add (Math-integer-neg (nth 1 a)) (nth 1 b))) | |
553 (or (eq ediff 0) | |
554 (and (not (consp ediff)) | |
555 (< ediff 10) | |
556 (> ediff -10) | |
557 (= (math-numdigs (nth 1 a)) calc-internal-prec)))) | |
558 ((= ediff 1) | |
559 (setq ediff (math-add (Math-integer-neg (nth 1 b)) | |
560 (math-scale-int (nth 1 a) 1))) | |
561 (and (not (consp ediff)) | |
562 (< ediff 10) | |
563 (> ediff -10) | |
564 (= (math-numdigs (nth 1 b)) calc-internal-prec))) | |
565 ((= ediff -1) | |
566 (setq ediff (math-add (Math-integer-neg (nth 1 a)) | |
567 (math-scale-int (nth 1 b) 1))) | |
568 (and (not (consp ediff)) | |
569 (< ediff 10) | |
570 (> ediff -10) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
571 (= (math-numdigs (nth 1 a)) calc-internal-prec)))))) |
40785 | 572 |
573 (defun math-nearly-equal (a b) ; [P N N] [Public] | |
574 (setq a (math-float a)) | |
575 (setq b (math-float b)) | |
576 (if (eq (car a) 'polar) (setq a (math-complex a))) | |
577 (if (eq (car b) 'polar) (setq b (math-complex b))) | |
578 (if (eq (car a) 'cplx) | |
579 (if (eq (car b) 'cplx) | |
580 (and (or (math-nearly-equal-float (nth 1 a) (nth 1 b)) | |
581 (and (math-nearly-zerop-float (nth 1 a) (nth 2 a)) | |
582 (math-nearly-zerop-float (nth 1 b) (nth 2 b)))) | |
583 (or (math-nearly-equal-float (nth 2 a) (nth 2 b)) | |
584 (and (math-nearly-zerop-float (nth 2 a) (nth 1 a)) | |
585 (math-nearly-zerop-float (nth 2 b) (nth 1 b))))) | |
586 (and (math-nearly-equal-float (nth 1 a) b) | |
587 (math-nearly-zerop-float (nth 2 a) b))) | |
588 (if (eq (car b) 'cplx) | |
589 (and (math-nearly-equal-float a (nth 1 b)) | |
590 (math-nearly-zerop-float a (nth 2 b))) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
591 (math-nearly-equal-float a b)))) |
40785 | 592 |
593 ;;; True if A is nearly zero compared to B. [P F F] | |
594 (defun math-nearly-zerop-float (a b) | |
595 (or (eq (nth 1 a) 0) | |
596 (<= (+ (math-numdigs (nth 1 a)) (nth 2 a)) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
597 (1+ (- (+ (math-numdigs (nth 1 b)) (nth 2 b)) calc-internal-prec))))) |
40785 | 598 |
599 (defun math-nearly-zerop (a b) ; [P N R] [Public] | |
600 (setq a (math-float a)) | |
601 (setq b (math-float b)) | |
602 (if (eq (car a) 'cplx) | |
603 (and (math-nearly-zerop-float (nth 1 a) b) | |
604 (math-nearly-zerop-float (nth 2 a) b)) | |
605 (if (eq (car a) 'polar) | |
606 (math-nearly-zerop-float (nth 1 a) b) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
607 (math-nearly-zerop-float a b)))) |
40785 | 608 |
609 ;;; This implementation could be improved, accuracy-wise. | |
610 (defun math-hypot (a b) | |
611 (cond ((Math-zerop a) (math-abs b)) | |
612 ((Math-zerop b) (math-abs a)) | |
613 ((not (Math-scalarp a)) | |
614 (if (math-infinitep a) | |
615 (if (math-infinitep b) | |
616 (if (equal a b) | |
617 a | |
618 '(var nan var-nan)) | |
619 a) | |
620 (calc-record-why 'scalarp a) | |
621 (list 'calcFunc-hypot a b))) | |
622 ((not (Math-scalarp b)) | |
623 (if (math-infinitep b) | |
624 b | |
625 (calc-record-why 'scalarp b) | |
626 (list 'calcFunc-hypot a b))) | |
627 ((and (Math-numberp a) (Math-numberp b)) | |
628 (math-with-extra-prec 1 | |
629 (math-sqrt (math-add (calcFunc-abssqr a) (calcFunc-abssqr b))))) | |
630 ((eq (car-safe a) 'hms) | |
631 (if (eq (car-safe b) 'hms) ; this helps sdev's of hms forms | |
632 (math-to-hms (math-hypot (math-from-hms a 'deg) | |
633 (math-from-hms b 'deg))) | |
634 (math-to-hms (math-hypot (math-from-hms a 'deg) b)))) | |
635 ((eq (car-safe b) 'hms) | |
636 (math-to-hms (math-hypot a (math-from-hms b 'deg)))) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
637 (t nil))) |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41044
diff
changeset
|
638 (defalias 'calcFunc-hypot 'math-hypot) |
40785 | 639 |
640 (defun calcFunc-sqr (x) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
641 (math-pow x 2)) |
40785 | 642 |
643 | |
644 | |
645 (defun math-nth-root (a n) | |
646 (cond ((= n 2) (math-sqrt a)) | |
647 ((Math-zerop a) a) | |
648 ((Math-negp a) nil) | |
649 ((Math-integerp a) | |
650 (let ((root (math-nth-root-integer a n))) | |
651 (if (car root) | |
652 (cdr root) | |
653 (and (not calc-symbolic-mode) | |
654 (math-nth-root-float (math-float a) n | |
655 (math-float (cdr root))))))) | |
656 ((eq (car-safe a) 'frac) | |
657 (let* ((num-root (math-nth-root-integer (nth 1 a) n)) | |
658 (den-root (math-nth-root-integer (nth 2 a) n))) | |
659 (if (and (car num-root) (car den-root)) | |
660 (list 'frac (cdr num-root) (cdr den-root)) | |
661 (and (not calc-symbolic-mode) | |
662 (math-nth-root-float | |
663 (math-float a) n | |
664 (math-div-float (math-float (cdr num-root)) | |
665 (math-float (cdr den-root)))))))) | |
666 ((eq (car-safe a) 'float) | |
667 (and (not calc-symbolic-mode) | |
668 (math-nth-root-float a n))) | |
669 ((eq (car-safe a) 'polar) | |
670 (let ((root (math-nth-root (nth 1 a) n))) | |
671 (and root (list 'polar root (math-div (nth 2 a) n))))) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
672 (t nil))) |
40785 | 673 |
58475
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
674 ;; The variables math-nrf-n, math-nrf-nf and math-nrf-nfm1 are local |
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
675 ;; to math-nth-root-float, but are used by math-nth-root-float-iter, |
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
676 ;; which is called by math-nth-root-float. |
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
677 (defvar math-nrf-n) |
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
678 (defvar math-nrf-nf) |
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
679 (defvar math-nrf-nfm1) |
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
680 |
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
681 (defun math-nth-root-float (a math-nrf-n &optional guess) |
40785 | 682 (math-inexact-result) |
683 (math-with-extra-prec 1 | |
58475
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
684 (let ((math-nrf-nf (math-float math-nrf-n)) |
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
685 (math-nrf-nfm1 (math-float (1- math-nrf-n)))) |
40785 | 686 (math-nth-root-float-iter a (or guess |
687 (math-make-float | |
688 1 (/ (+ (math-numdigs (nth 1 a)) | |
689 (nth 2 a) | |
58475
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
690 (/ math-nrf-n 2)) |
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
691 math-nrf-n))))))) |
40785 | 692 |
58475
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
693 (defun math-nth-root-float-iter (a guess) |
40785 | 694 (math-working "root" guess) |
58475
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
695 (let ((g2 (math-div-float (math-add-float (math-mul math-nrf-nfm1 guess) |
40785 | 696 (math-div-float |
58475
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
697 a (math-ipow guess (1- math-nrf-n)))) |
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
698 math-nrf-nf))) |
40785 | 699 (if (math-nearly-equal-float g2 guess) |
700 g2 | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
701 (math-nth-root-float-iter a g2)))) |
40785 | 702 |
58475
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
703 ;; The variable math-nri-n is local to math-nth-root-integer, but |
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
704 ;; is used by math-nth-root-int-iter, which is called by |
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
705 ;; math-nth-root-int. |
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
706 (defvar math-nri-n) |
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
707 |
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
708 (defun math-nth-root-integer (a math-nri-n &optional guess) ; [I I S] |
40785 | 709 (math-nth-root-int-iter a (or guess |
710 (math-scale-int 1 (/ (+ (math-numdigs a) | |
58475
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
711 (1- math-nri-n)) |
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
712 math-nri-n))))) |
40785 | 713 |
58475
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
714 (defun math-nth-root-int-iter (a guess) |
40785 | 715 (math-working "root" guess) |
58475
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
716 (let* ((q (math-idivmod a (math-ipow guess (1- math-nri-n)))) |
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
717 (s (math-add (car q) (math-mul (1- math-nri-n) guess))) |
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
718 (g2 (math-idivmod s math-nri-n))) |
40785 | 719 (if (Math-natnum-lessp (car g2) guess) |
720 (math-nth-root-int-iter a (car g2)) | |
721 (cons (and (equal (car g2) guess) | |
722 (eq (cdr q) 0) | |
723 (eq (cdr g2) 0)) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
724 guess)))) |
40785 | 725 |
726 (defun calcFunc-nroot (x n) | |
727 (calcFunc-pow x (if (integerp n) | |
728 (math-make-frac 1 n) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
729 (math-div 1 n)))) |
40785 | 730 |
731 | |
732 | |
733 | |
734 ;;;; Transcendental functions. | |
735 | |
736 ;;; All of these functions are defined on the complex plane. | |
737 ;;; (Branch cuts, etc. follow Steele's Common Lisp book.) | |
738 | |
739 ;;; Most functions increase calc-internal-prec by 2 digits, then round | |
740 ;;; down afterward. "-raw" functions use the current precision, require | |
741 ;;; their arguments to be in float (or complex float) format, and always | |
742 ;;; work in radians (where applicable). | |
743 | |
744 (defun math-to-radians (a) ; [N N] | |
745 (cond ((eq (car-safe a) 'hms) | |
746 (math-from-hms a 'rad)) | |
747 ((memq calc-angle-mode '(deg hms)) | |
748 (math-mul a (math-pi-over-180))) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
749 (t a))) |
40785 | 750 |
751 (defun math-from-radians (a) ; [N N] | |
752 (cond ((eq calc-angle-mode 'deg) | |
753 (if (math-constp a) | |
754 (math-div a (math-pi-over-180)) | |
755 (list 'calcFunc-deg a))) | |
756 ((eq calc-angle-mode 'hms) | |
757 (math-to-hms a 'rad)) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
758 (t a))) |
40785 | 759 |
760 (defun math-to-radians-2 (a) ; [N N] | |
761 (cond ((eq (car-safe a) 'hms) | |
762 (math-from-hms a 'rad)) | |
763 ((memq calc-angle-mode '(deg hms)) | |
764 (if calc-symbolic-mode | |
765 (math-div (math-mul a '(var pi var-pi)) 180) | |
766 (math-mul a (math-pi-over-180)))) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
767 (t a))) |
40785 | 768 |
769 (defun math-from-radians-2 (a) ; [N N] | |
770 (cond ((memq calc-angle-mode '(deg hms)) | |
771 (if calc-symbolic-mode | |
772 (math-div (math-mul 180 a) '(var pi var-pi)) | |
773 (math-div a (math-pi-over-180)))) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
774 (t a))) |
40785 | 775 |
776 | |
777 | |
778 ;;; Sine, cosine, and tangent. | |
779 | |
780 (defun calcFunc-sin (x) ; [N N] [Public] | |
781 (cond ((and (integerp x) | |
782 (if (eq calc-angle-mode 'deg) | |
783 (= (% x 90) 0) | |
784 (= x 0))) | |
785 (aref [0 1 0 -1] (math-mod (/ x 90) 4))) | |
786 ((Math-scalarp x) | |
787 (math-with-extra-prec 2 | |
788 (math-sin-raw (math-to-radians (math-float x))))) | |
789 ((eq (car x) 'sdev) | |
790 (if (math-constp x) | |
791 (math-with-extra-prec 2 | |
792 (let* ((xx (math-to-radians (math-float (nth 1 x)))) | |
793 (xs (math-to-radians (math-float (nth 2 x)))) | |
794 (sc (math-sin-cos-raw xx))) | |
795 (math-make-sdev (car sc) (math-mul xs (cdr sc))))) | |
796 (math-make-sdev (calcFunc-sin (nth 1 x)) | |
797 (math-mul (nth 2 x) (calcFunc-cos (nth 1 x)))))) | |
798 ((and (eq (car x) 'intv) (math-intv-constp x)) | |
799 (calcFunc-cos (math-sub x (math-quarter-circle nil)))) | |
800 ((equal x '(var nan var-nan)) | |
801 x) | |
802 (t (calc-record-why 'scalarp x) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
803 (list 'calcFunc-sin x)))) |
40785 | 804 |
805 (defun calcFunc-cos (x) ; [N N] [Public] | |
806 (cond ((and (integerp x) | |
807 (if (eq calc-angle-mode 'deg) | |
808 (= (% x 90) 0) | |
809 (= x 0))) | |
810 (aref [1 0 -1 0] (math-mod (/ x 90) 4))) | |
811 ((Math-scalarp x) | |
812 (math-with-extra-prec 2 | |
813 (math-cos-raw (math-to-radians (math-float x))))) | |
814 ((eq (car x) 'sdev) | |
815 (if (math-constp x) | |
816 (math-with-extra-prec 2 | |
817 (let* ((xx (math-to-radians (math-float (nth 1 x)))) | |
818 (xs (math-to-radians (math-float (nth 2 x)))) | |
819 (sc (math-sin-cos-raw xx))) | |
820 (math-make-sdev (cdr sc) (math-mul xs (car sc))))) | |
821 (math-make-sdev (calcFunc-cos (nth 1 x)) | |
822 (math-mul (nth 2 x) (calcFunc-sin (nth 1 x)))))) | |
823 ((and (eq (car x) 'intv) (math-intv-constp x)) | |
824 (math-with-extra-prec 2 | |
825 (let* ((xx (math-to-radians (math-float x))) | |
826 (na (math-floor (math-div (nth 2 xx) (math-pi)))) | |
827 (nb (math-floor (math-div (nth 3 xx) (math-pi)))) | |
828 (span (math-sub nb na))) | |
829 (if (memq span '(0 1)) | |
830 (let ((int (math-sort-intv (nth 1 x) | |
831 (math-cos-raw (nth 2 xx)) | |
832 (math-cos-raw (nth 3 xx))))) | |
833 (if (eq span 1) | |
834 (if (math-evenp na) | |
835 (math-make-intv (logior (nth 1 x) 2) | |
836 -1 | |
837 (nth 3 int)) | |
838 (math-make-intv (logior (nth 1 x) 1) | |
839 (nth 2 int) | |
840 1)) | |
841 int)) | |
842 (list 'intv 3 -1 1))))) | |
843 ((equal x '(var nan var-nan)) | |
844 x) | |
845 (t (calc-record-why 'scalarp x) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
846 (list 'calcFunc-cos x)))) |
40785 | 847 |
848 (defun calcFunc-sincos (x) ; [V N] [Public] | |
849 (if (Math-scalarp x) | |
850 (math-with-extra-prec 2 | |
851 (let ((sc (math-sin-cos-raw (math-to-radians (math-float x))))) | |
852 (list 'vec (cdr sc) (car sc)))) ; the vector [cos, sin] | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
853 (list 'vec (calcFunc-sin x) (calcFunc-cos x)))) |
40785 | 854 |
855 (defun calcFunc-tan (x) ; [N N] [Public] | |
856 (cond ((and (integerp x) | |
857 (if (eq calc-angle-mode 'deg) | |
858 (= (% x 180) 0) | |
859 (= x 0))) | |
860 0) | |
861 ((Math-scalarp x) | |
862 (math-with-extra-prec 2 | |
863 (math-tan-raw (math-to-radians (math-float x))))) | |
864 ((eq (car x) 'sdev) | |
865 (if (math-constp x) | |
866 (math-with-extra-prec 2 | |
867 (let* ((xx (math-to-radians (math-float (nth 1 x)))) | |
868 (xs (math-to-radians (math-float (nth 2 x)))) | |
869 (sc (math-sin-cos-raw xx))) | |
870 (if (and (math-zerop (cdr sc)) (not calc-infinite-mode)) | |
871 (progn | |
872 (calc-record-why "*Division by zero") | |
873 (list 'calcFunc-tan x)) | |
874 (math-make-sdev (math-div-float (car sc) (cdr sc)) | |
875 (math-div-float xs (math-sqr (cdr sc))))))) | |
876 (math-make-sdev (calcFunc-tan (nth 1 x)) | |
877 (math-div (nth 2 x) | |
878 (math-sqr (calcFunc-cos (nth 1 x))))))) | |
879 ((and (eq (car x) 'intv) (math-intv-constp x)) | |
880 (or (math-with-extra-prec 2 | |
881 (let* ((xx (math-to-radians (math-float x))) | |
882 (na (math-floor (math-div (math-sub (nth 2 xx) | |
883 (math-pi-over-2)) | |
884 (math-pi)))) | |
885 (nb (math-floor (math-div (math-sub (nth 3 xx) | |
886 (math-pi-over-2)) | |
887 (math-pi))))) | |
888 (and (equal na nb) | |
889 (math-sort-intv (nth 1 x) | |
890 (math-tan-raw (nth 2 xx)) | |
891 (math-tan-raw (nth 3 xx)))))) | |
892 '(intv 3 (neg (var inf var-inf)) (var inf var-inf)))) | |
893 ((equal x '(var nan var-nan)) | |
894 x) | |
895 (t (calc-record-why 'scalarp x) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
896 (list 'calcFunc-tan x)))) |
40785 | 897 |
60079
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
898 (defun calcFunc-sec (x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
899 (cond ((and (integerp x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
900 (eq calc-angle-mode 'deg) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
901 (= (% x 180) 0)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
902 (if (= (% x 360) 0) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
903 1 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
904 -1)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
905 ((and (integerp x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
906 (eq calc-angle-mode 'rad) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
907 (= x 0)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
908 1) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
909 ((Math-scalarp x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
910 (math-with-extra-prec 2 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
911 (math-sec-raw (math-to-radians (math-float x))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
912 ((eq (car x) 'sdev) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
913 (if (math-constp x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
914 (math-with-extra-prec 2 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
915 (let* ((xx (math-to-radians (math-float (nth 1 x)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
916 (xs (math-to-radians (math-float (nth 2 x)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
917 (sc (math-sin-cos-raw xx))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
918 (if (and (math-zerop (cdr sc)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
919 (not calc-infinite-mode)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
920 (progn |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
921 (calc-record-why "*Division by zero") |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
922 (list 'calcFunc-sec x)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
923 (math-make-sdev (math-div-float '(float 1 0) (cdr sc)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
924 (math-div-float |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
925 (math-mul xs (car sc)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
926 (math-sqr (cdr sc))))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
927 (math-make-sdev (calcFunc-sec (nth 1 x)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
928 (math-div |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
929 (math-mul (nth 2 x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
930 (calcFunc-sin (nth 1 x))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
931 (math-sqr (calcFunc-cos (nth 1 x))))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
932 ((and (eq (car x) 'intv) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
933 (math-intv-constp x)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
934 (math-with-extra-prec 2 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
935 (let* ((xx (math-to-radians (math-float x))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
936 (na (math-floor (math-div (math-sub (nth 2 xx) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
937 (math-pi-over-2)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
938 (math-pi)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
939 (nb (math-floor (math-div (math-sub (nth 3 xx) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
940 (math-pi-over-2)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
941 (math-pi)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
942 (naa (math-floor (math-div (nth 2 xx) (math-pi-over-2)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
943 (nbb (math-floor (math-div (nth 3 xx) (math-pi-over-2)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
944 (span (math-sub nbb naa))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
945 (if (not (equal na nb)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
946 '(intv 3 (neg (var inf var-inf)) (var inf var-inf)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
947 (let ((int (math-sort-intv (nth 1 x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
948 (math-sec-raw (nth 2 xx)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
949 (math-sec-raw (nth 3 xx))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
950 (if (eq span 1) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
951 (if (math-evenp (math-div (math-add naa 1) 2)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
952 (math-make-intv (logior (nth 1 int) 2) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
953 1 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
954 (nth 3 int)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
955 (math-make-intv (logior (nth 1 int) 1) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
956 (nth 2 int) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
957 -1)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
958 int)))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
959 ((equal x '(var nan var-nan)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
960 x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
961 (t (calc-record-why 'scalarp x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
962 (list 'calcFunc-sec x)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
963 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
964 (defun calcFunc-csc (x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
965 (cond ((and (integerp x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
966 (eq calc-angle-mode 'deg) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
967 (= (% (- x 90) 180) 0)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
968 (if (= (% (- x 90) 360) 0) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
969 1 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
970 -1)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
971 ((Math-scalarp x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
972 (math-with-extra-prec 2 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
973 (math-csc-raw (math-to-radians (math-float x))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
974 ((eq (car x) 'sdev) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
975 (if (math-constp x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
976 (math-with-extra-prec 2 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
977 (let* ((xx (math-to-radians (math-float (nth 1 x)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
978 (xs (math-to-radians (math-float (nth 2 x)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
979 (sc (math-sin-cos-raw xx))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
980 (if (and (math-zerop (car sc)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
981 (not calc-infinite-mode)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
982 (progn |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
983 (calc-record-why "*Division by zero") |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
984 (list 'calcFunc-csc x)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
985 (math-make-sdev (math-div-float '(float 1 0) (car sc)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
986 (math-div-float |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
987 (math-mul xs (cdr sc)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
988 (math-sqr (car sc))))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
989 (math-make-sdev (calcFunc-csc (nth 1 x)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
990 (math-div |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
991 (math-mul (nth 2 x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
992 (calcFunc-cos (nth 1 x))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
993 (math-sqr (calcFunc-sin (nth 1 x))))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
994 ((and (eq (car x) 'intv) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
995 (math-intv-constp x)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
996 (math-with-extra-prec 2 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
997 (let* ((xx (math-to-radians (math-float x))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
998 (na (math-floor (math-div (nth 2 xx) (math-pi)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
999 (nb (math-floor (math-div (nth 3 xx) (math-pi)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1000 (naa (math-floor (math-div (nth 2 xx) (math-pi-over-2)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1001 (nbb (math-floor (math-div (nth 3 xx) (math-pi-over-2)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1002 (span (math-sub nbb naa))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1003 (if (not (equal na nb)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1004 '(intv 3 (neg (var inf var-inf)) (var inf var-inf)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1005 (let ((int (math-sort-intv (nth 1 x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1006 (math-csc-raw (nth 2 xx)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1007 (math-csc-raw (nth 3 xx))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1008 (if (eq span 1) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1009 (if (math-evenp (math-div naa 2)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1010 (math-make-intv (logior (nth 1 int) 2) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1011 1 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1012 (nth 3 int)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1013 (math-make-intv (logior (nth 1 int) 1) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1014 (nth 2 int) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1015 -1)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1016 int)))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1017 ((equal x '(var nan var-nan)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1018 x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1019 (t (calc-record-why 'scalarp x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1020 (list 'calcFunc-csc x)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1021 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1022 (defun calcFunc-cot (x) ; [N N] [Public] |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1023 (cond ((and (integerp x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1024 (if (eq calc-angle-mode 'deg) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1025 (= (% (- x 90) 180) 0) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1026 (= x 0))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1027 0) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1028 ((Math-scalarp x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1029 (math-with-extra-prec 2 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1030 (math-cot-raw (math-to-radians (math-float x))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1031 ((eq (car x) 'sdev) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1032 (if (math-constp x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1033 (math-with-extra-prec 2 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1034 (let* ((xx (math-to-radians (math-float (nth 1 x)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1035 (xs (math-to-radians (math-float (nth 2 x)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1036 (sc (math-sin-cos-raw xx))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1037 (if (and (math-zerop (car sc)) (not calc-infinite-mode)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1038 (progn |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1039 (calc-record-why "*Division by zero") |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1040 (list 'calcFunc-cot x)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1041 (math-make-sdev (math-div-float (cdr sc) (car sc)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1042 (math-div-float xs (math-sqr (car sc))))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1043 (math-make-sdev (calcFunc-cot (nth 1 x)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1044 (math-div (nth 2 x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1045 (math-sqr (calcFunc-sin (nth 1 x))))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1046 ((and (eq (car x) 'intv) (math-intv-constp x)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1047 (or (math-with-extra-prec 2 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1048 (let* ((xx (math-to-radians (math-float x))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1049 (na (math-floor (math-div (nth 2 xx) (math-pi)))) |
60164
697e2ba683cc
(calc-arctan, calc-tanh, calc-arctanh): Removed extra definitions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
60085
diff
changeset
|
1050 (nb (math-floor (math-div (nth 3 xx) (math-pi))))) |
60079
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1051 (and (equal na nb) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1052 (math-sort-intv (nth 1 x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1053 (math-cot-raw (nth 2 xx)) |
60164
697e2ba683cc
(calc-arctan, calc-tanh, calc-arctanh): Removed extra definitions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
60085
diff
changeset
|
1054 (math-cot-raw (nth 3 xx)))))) |
60079
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1055 '(intv 3 (neg (var inf var-inf)) (var inf var-inf)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1056 ((equal x '(var nan var-nan)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1057 x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1058 (t (calc-record-why 'scalarp x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1059 (list 'calcFunc-cot x)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1060 |
40785 | 1061 (defun math-sin-raw (x) ; [N N] |
1062 (cond ((eq (car x) 'cplx) | |
1063 (let* ((expx (math-exp-raw (nth 2 x))) | |
1064 (expmx (math-div-float '(float 1 0) expx)) | |
1065 (sc (math-sin-cos-raw (nth 1 x)))) | |
1066 (list 'cplx | |
1067 (math-mul-float (car sc) | |
1068 (math-mul-float (math-add-float expx expmx) | |
1069 '(float 5 -1))) | |
1070 (math-mul-float (cdr sc) | |
1071 (math-mul-float (math-sub-float expx expmx) | |
1072 '(float 5 -1)))))) | |
1073 ((eq (car x) 'polar) | |
1074 (math-polar (math-sin-raw (math-complex x)))) | |
1075 ((Math-integer-negp (nth 1 x)) | |
1076 (math-neg-float (math-sin-raw (math-neg-float x)))) | |
1077 ((math-lessp-float '(float 7 0) x) ; avoid inf loops due to roundoff | |
1078 (math-sin-raw (math-mod x (math-two-pi)))) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1079 (t (math-sin-raw-2 x x)))) |
40785 | 1080 |
1081 (defun math-cos-raw (x) ; [N N] | |
1082 (if (eq (car-safe x) 'polar) | |
1083 (math-polar (math-cos-raw (math-complex x))) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1084 (math-sin-raw (math-sub (math-pi-over-2) x)))) |
40785 | 1085 |
60079
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1086 (defun math-sec-raw (x) ; [N N] |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1087 (cond ((eq (car x) 'cplx) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1088 (let* ((x (math-mul x '(float 1 0))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1089 (expx (math-exp-raw (nth 2 x))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1090 (expmx (math-div-float '(float 1 0) expx)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1091 (sh (math-mul-float (math-sub-float expx expmx) '(float 5 -1))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1092 (ch (math-mul-float (math-add-float expx expmx) '(float 5 -1))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1093 (sc (math-sin-cos-raw (nth 1 x))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1094 (d (math-add-float |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1095 (math-mul-float (math-sqr (car sc)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1096 (math-sqr sh)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1097 (math-mul-float (math-sqr (cdr sc)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1098 (math-sqr ch))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1099 (and (not (eq (nth 1 d) 0)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1100 (list 'cplx |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1101 (math-div-float (math-mul-float (cdr sc) ch) d) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1102 (math-div-float (math-mul-float (car sc) sh) d))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1103 ((eq (car x) 'polar) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1104 (math-polar (math-sec-raw (math-complex x)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1105 (t |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1106 (let ((cs (math-cos-raw x))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1107 (if (eq cs 0) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1108 (math-div 1 0) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1109 (math-div-float '(float 1 0) cs)))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1110 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1111 (defun math-csc-raw (x) ; [N N] |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1112 (cond ((eq (car x) 'cplx) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1113 (let* ((x (math-mul x '(float 1 0))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1114 (expx (math-exp-raw (nth 2 x))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1115 (expmx (math-div-float '(float 1 0) expx)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1116 (sh (math-mul-float (math-sub-float expx expmx) '(float 5 -1))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1117 (ch (math-mul-float (math-add-float expx expmx) '(float 5 -1))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1118 (sc (math-sin-cos-raw (nth 1 x))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1119 (d (math-add-float |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1120 (math-mul-float (math-sqr (car sc)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1121 (math-sqr ch)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1122 (math-mul-float (math-sqr (cdr sc)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1123 (math-sqr sh))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1124 (and (not (eq (nth 1 d) 0)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1125 (list 'cplx |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1126 (math-div-float (math-mul-float (car sc) ch) d) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1127 (math-div-float (math-mul-float (cdr sc) sh) d))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1128 ((eq (car x) 'polar) |
60085
f91c9a606821
(math-csc-raw): Fix typo.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
60079
diff
changeset
|
1129 (math-polar (math-csc-raw (math-complex x)))) |
60079
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1130 (t |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1131 (let ((sn (math-sin-raw x))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1132 (if (eq sn 0) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1133 (math-div 1 0) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1134 (math-div-float '(float 1 0) sn)))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1135 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1136 (defun math-cot-raw (x) ; [N N] |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1137 (cond ((eq (car x) 'cplx) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1138 (let* ((x (math-mul x '(float 1 0))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1139 (expx (math-exp-raw (nth 2 x))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1140 (expmx (math-div-float '(float 1 0) expx)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1141 (sh (math-mul-float (math-sub-float expx expmx) '(float 5 -1))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1142 (ch (math-mul-float (math-add-float expx expmx) '(float 5 -1))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1143 (sc (math-sin-cos-raw (nth 1 x))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1144 (d (math-add-float |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1145 (math-sqr (car sc)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1146 (math-sqr sh)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1147 (and (not (eq (nth 1 d) 0)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1148 (list 'cplx |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1149 (math-div-float |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1150 (math-mul-float (car sc) (cdr sc)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1151 d) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1152 (math-neg |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1153 (math-div-float |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1154 (math-mul-float sh ch) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1155 d)))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1156 ((eq (car x) 'polar) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1157 (math-polar (math-cot-raw (math-complex x)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1158 (t |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1159 (let ((sc (math-sin-cos-raw x))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1160 (if (eq (nth 1 (car sc)) 0) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1161 (math-div (cdr sc) 0) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1162 (math-div-float (cdr sc) (car sc))))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1163 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1164 |
40785 | 1165 ;;; This could use a smarter method: Reduce x as in math-sin-raw, then |
1166 ;;; compute either sin(x) or cos(x), whichever is smaller, and compute | |
1167 ;;; the other using the identity sin(x)^2 + cos(x)^2 = 1. | |
1168 (defun math-sin-cos-raw (x) ; [F.F F] (result is (sin x . cos x)) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1169 (cons (math-sin-raw x) (math-cos-raw x))) |
40785 | 1170 |
1171 (defun math-tan-raw (x) ; [N N] | |
1172 (cond ((eq (car x) 'cplx) | |
1173 (let* ((x (math-mul x '(float 2 0))) | |
1174 (expx (math-exp-raw (nth 2 x))) | |
1175 (expmx (math-div-float '(float 1 0) expx)) | |
1176 (sc (math-sin-cos-raw (nth 1 x))) | |
1177 (d (math-add-float (cdr sc) | |
1178 (math-mul-float (math-add-float expx expmx) | |
1179 '(float 5 -1))))) | |
1180 (and (not (eq (nth 1 d) 0)) | |
1181 (list 'cplx | |
1182 (math-div-float (car sc) d) | |
1183 (math-div-float (math-mul-float (math-sub-float expx | |
1184 expmx) | |
1185 '(float 5 -1)) d))))) | |
1186 ((eq (car x) 'polar) | |
1187 (math-polar (math-tan-raw (math-complex x)))) | |
1188 (t | |
1189 (let ((sc (math-sin-cos-raw x))) | |
1190 (if (eq (nth 1 (cdr sc)) 0) | |
1191 (math-div (car sc) 0) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1192 (math-div-float (car sc) (cdr sc))))))) |
40785 | 1193 |
1194 (defun math-sin-raw-2 (x orgx) ; This avoids poss of inf recursion. [F F] | |
1195 (let ((xmpo2 (math-sub-float (math-pi-over-2) x))) | |
1196 (cond ((Math-integer-negp (nth 1 xmpo2)) | |
1197 (math-neg-float (math-sin-raw-2 (math-sub-float x (math-pi)) | |
1198 orgx))) | |
1199 ((math-lessp-float (math-pi-over-4) x) | |
1200 (math-cos-raw-2 xmpo2 orgx)) | |
1201 ((math-lessp-float x (math-neg (math-pi-over-4))) | |
1202 (math-neg (math-cos-raw-2 (math-add (math-pi-over-2) x) orgx))) | |
1203 ((math-nearly-zerop-float x orgx) '(float 0 0)) | |
1204 (calc-symbolic-mode (signal 'inexact-result nil)) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1205 (t (math-sin-series x 6 4 x (math-neg-float (math-sqr-float x))))))) |
40785 | 1206 |
1207 (defun math-cos-raw-2 (x orgx) ; [F F] | |
1208 (cond ((math-nearly-zerop-float x orgx) '(float 1 0)) | |
1209 (calc-symbolic-mode (signal 'inexact-result nil)) | |
1210 (t (let ((xnegsqr (math-neg-float (math-sqr-float x)))) | |
1211 (math-sin-series | |
1212 (math-add-float '(float 1 0) | |
1213 (math-mul-float xnegsqr '(float 5 -1))) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1214 24 5 xnegsqr xnegsqr))))) |
40785 | 1215 |
1216 (defun math-sin-series (sum nfac n x xnegsqr) | |
1217 (math-working "sin" sum) | |
1218 (let* ((nextx (math-mul-float x xnegsqr)) | |
1219 (nextsum (math-add-float sum (math-div-float nextx | |
1220 (math-float nfac))))) | |
1221 (if (math-nearly-equal-float sum nextsum) | |
1222 sum | |
1223 (math-sin-series nextsum (math-mul nfac (* n (1+ n))) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1224 (+ n 2) nextx xnegsqr)))) |
40785 | 1225 |
1226 | |
1227 ;;; Inverse sine, cosine, tangent. | |
1228 | |
1229 (defun calcFunc-arcsin (x) ; [N N] [Public] | |
1230 (cond ((eq x 0) 0) | |
1231 ((and (eq x 1) (eq calc-angle-mode 'deg)) 90) | |
1232 ((and (eq x -1) (eq calc-angle-mode 'deg)) -90) | |
1233 (calc-symbolic-mode (signal 'inexact-result nil)) | |
1234 ((Math-numberp x) | |
1235 (math-with-extra-prec 2 | |
1236 (math-from-radians (math-arcsin-raw (math-float x))))) | |
1237 ((eq (car x) 'sdev) | |
1238 (math-make-sdev (calcFunc-arcsin (nth 1 x)) | |
1239 (math-from-radians | |
1240 (math-div (nth 2 x) | |
1241 (math-sqrt | |
1242 (math-sub 1 (math-sqr (nth 1 x)))))))) | |
1243 ((eq (car x) 'intv) | |
1244 (math-sort-intv (nth 1 x) | |
1245 (calcFunc-arcsin (nth 2 x)) | |
1246 (calcFunc-arcsin (nth 3 x)))) | |
1247 ((equal x '(var nan var-nan)) | |
1248 x) | |
1249 (t (calc-record-why 'numberp x) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1250 (list 'calcFunc-arcsin x)))) |
40785 | 1251 |
1252 (defun calcFunc-arccos (x) ; [N N] [Public] | |
1253 (cond ((eq x 1) 0) | |
1254 ((and (eq x 0) (eq calc-angle-mode 'deg)) 90) | |
1255 ((and (eq x -1) (eq calc-angle-mode 'deg)) 180) | |
1256 (calc-symbolic-mode (signal 'inexact-result nil)) | |
1257 ((Math-numberp x) | |
1258 (math-with-extra-prec 2 | |
1259 (math-from-radians (math-arccos-raw (math-float x))))) | |
1260 ((eq (car x) 'sdev) | |
1261 (math-make-sdev (calcFunc-arccos (nth 1 x)) | |
1262 (math-from-radians | |
1263 (math-div (nth 2 x) | |
1264 (math-sqrt | |
1265 (math-sub 1 (math-sqr (nth 1 x)))))))) | |
1266 ((eq (car x) 'intv) | |
1267 (math-sort-intv (nth 1 x) | |
1268 (calcFunc-arccos (nth 2 x)) | |
1269 (calcFunc-arccos (nth 3 x)))) | |
1270 ((equal x '(var nan var-nan)) | |
1271 x) | |
1272 (t (calc-record-why 'numberp x) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1273 (list 'calcFunc-arccos x)))) |
40785 | 1274 |
1275 (defun calcFunc-arctan (x) ; [N N] [Public] | |
1276 (cond ((eq x 0) 0) | |
1277 ((and (eq x 1) (eq calc-angle-mode 'deg)) 45) | |
1278 ((and (eq x -1) (eq calc-angle-mode 'deg)) -45) | |
1279 ((Math-numberp x) | |
1280 (math-with-extra-prec 2 | |
1281 (math-from-radians (math-arctan-raw (math-float x))))) | |
1282 ((eq (car x) 'sdev) | |
1283 (math-make-sdev (calcFunc-arctan (nth 1 x)) | |
1284 (math-from-radians | |
1285 (math-div (nth 2 x) | |
1286 (math-add 1 (math-sqr (nth 1 x))))))) | |
1287 ((eq (car x) 'intv) | |
1288 (math-sort-intv (nth 1 x) | |
1289 (calcFunc-arctan (nth 2 x)) | |
1290 (calcFunc-arctan (nth 3 x)))) | |
1291 ((equal x '(var inf var-inf)) | |
1292 (math-quarter-circle t)) | |
1293 ((equal x '(neg (var inf var-inf))) | |
1294 (math-neg (math-quarter-circle t))) | |
1295 ((equal x '(var nan var-nan)) | |
1296 x) | |
1297 (t (calc-record-why 'numberp x) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1298 (list 'calcFunc-arctan x)))) |
40785 | 1299 |
1300 (defun math-arcsin-raw (x) ; [N N] | |
1301 (let ((a (math-sqrt-raw (math-sub '(float 1 0) (math-sqr x))))) | |
1302 (if (or (memq (car x) '(cplx polar)) | |
1303 (memq (car a) '(cplx polar))) | |
1304 (math-with-extra-prec 2 ; use extra precision for difficult case | |
1305 (math-mul '(cplx 0 -1) | |
1306 (math-ln-raw (math-add (math-mul '(cplx 0 1) x) a)))) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1307 (math-arctan2-raw x a)))) |
40785 | 1308 |
1309 (defun math-arccos-raw (x) ; [N N] | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1310 (math-sub (math-pi-over-2) (math-arcsin-raw x))) |
40785 | 1311 |
1312 (defun math-arctan-raw (x) ; [N N] | |
1313 (cond ((memq (car x) '(cplx polar)) | |
1314 (math-with-extra-prec 2 ; extra-extra | |
1315 (math-div (math-sub | |
1316 (math-ln-raw (math-add 1 (math-mul '(cplx 0 1) x))) | |
1317 (math-ln-raw (math-add 1 (math-mul '(cplx 0 -1) x)))) | |
1318 '(cplx 0 2)))) | |
1319 ((Math-integer-negp (nth 1 x)) | |
1320 (math-neg-float (math-arctan-raw (math-neg-float x)))) | |
1321 ((math-zerop x) x) | |
1322 (calc-symbolic-mode (signal 'inexact-result nil)) | |
1323 ((math-equal-int x 1) (math-pi-over-4)) | |
1324 ((math-equal-int x -1) (math-neg (math-pi-over-4))) | |
1325 ((math-lessp-float '(float 414214 -6) x) ; if x > sqrt(2) - 1, reduce | |
1326 (if (math-lessp-float '(float 1 0) x) | |
1327 (math-sub-float (math-mul-float (math-pi) '(float 5 -1)) | |
1328 (math-arctan-raw (math-div-float '(float 1 0) x))) | |
1329 (math-sub-float (math-mul-float (math-pi) '(float 25 -2)) | |
1330 (math-arctan-raw (math-div-float | |
1331 (math-sub-float '(float 1 0) x) | |
1332 (math-add-float '(float 1 0) | |
1333 x)))))) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1334 (t (math-arctan-series x 3 x (math-neg-float (math-sqr-float x)))))) |
40785 | 1335 |
1336 (defun math-arctan-series (sum n x xnegsqr) | |
1337 (math-working "arctan" sum) | |
1338 (let* ((nextx (math-mul-float x xnegsqr)) | |
1339 (nextsum (math-add-float sum (math-div-float nextx (math-float n))))) | |
1340 (if (math-nearly-equal-float sum nextsum) | |
1341 sum | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1342 (math-arctan-series nextsum (+ n 2) nextx xnegsqr)))) |
40785 | 1343 |
1344 (defun calcFunc-arctan2 (y x) ; [F R R] [Public] | |
1345 (if (Math-anglep y) | |
1346 (if (Math-anglep x) | |
1347 (math-with-extra-prec 2 | |
1348 (math-from-radians (math-arctan2-raw (math-float y) | |
1349 (math-float x)))) | |
1350 (calc-record-why 'anglep x) | |
1351 (list 'calcFunc-arctan2 y x)) | |
1352 (if (and (or (math-infinitep x) (math-anglep x)) | |
1353 (or (math-infinitep y) (math-anglep y))) | |
1354 (progn | |
1355 (if (math-posp x) | |
1356 (setq x 1) | |
1357 (if (math-negp x) | |
1358 (setq x -1) | |
1359 (or (math-zerop x) | |
1360 (setq x nil)))) | |
1361 (if (math-posp y) | |
1362 (setq y 1) | |
1363 (if (math-negp y) | |
1364 (setq y -1) | |
1365 (or (math-zerop y) | |
1366 (setq y nil)))) | |
1367 (if (and y x) | |
1368 (calcFunc-arctan2 y x) | |
1369 '(var nan var-nan))) | |
1370 (calc-record-why 'anglep y) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1371 (list 'calcFunc-arctan2 y x)))) |
40785 | 1372 |
1373 (defun math-arctan2-raw (y x) ; [F R R] | |
1374 (cond ((math-zerop y) | |
1375 (if (math-negp x) (math-pi) | |
1376 (if (or (math-floatp x) (math-floatp y)) '(float 0 0) 0))) | |
1377 ((math-zerop x) | |
1378 (if (math-posp y) | |
1379 (math-pi-over-2) | |
1380 (math-neg (math-pi-over-2)))) | |
1381 ((math-posp x) | |
1382 (math-arctan-raw (math-div-float y x))) | |
1383 ((math-posp y) | |
1384 (math-add-float (math-arctan-raw (math-div-float y x)) | |
1385 (math-pi))) | |
1386 (t | |
1387 (math-sub-float (math-arctan-raw (math-div-float y x)) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1388 (math-pi))))) |
40785 | 1389 |
1390 (defun calcFunc-arcsincos (x) ; [V N] [Public] | |
1391 (if (and (Math-vectorp x) | |
1392 (= (length x) 3)) | |
1393 (calcFunc-arctan2 (nth 2 x) (nth 1 x)) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1394 (math-reject-arg x "*Two-element vector expected"))) |
40785 | 1395 |
1396 | |
1397 | |
1398 ;;; Exponential function. | |
1399 | |
1400 (defun calcFunc-exp (x) ; [N N] [Public] | |
1401 (cond ((eq x 0) 1) | |
1402 ((and (memq x '(1 -1)) calc-symbolic-mode) | |
1403 (if (eq x 1) '(var e var-e) (math-div 1 '(var e var-e)))) | |
1404 ((Math-numberp x) | |
1405 (math-with-extra-prec 2 (math-exp-raw (math-float x)))) | |
1406 ((eq (car-safe x) 'sdev) | |
1407 (let ((ex (calcFunc-exp (nth 1 x)))) | |
1408 (math-make-sdev ex (math-mul (nth 2 x) ex)))) | |
1409 ((eq (car-safe x) 'intv) | |
1410 (math-make-intv (nth 1 x) (calcFunc-exp (nth 2 x)) | |
1411 (calcFunc-exp (nth 3 x)))) | |
1412 ((equal x '(var inf var-inf)) | |
1413 x) | |
1414 ((equal x '(neg (var inf var-inf))) | |
1415 0) | |
1416 ((equal x '(var nan var-nan)) | |
1417 x) | |
1418 (t (calc-record-why 'numberp x) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1419 (list 'calcFunc-exp x)))) |
40785 | 1420 |
1421 (defun calcFunc-expm1 (x) ; [N N] [Public] | |
1422 (cond ((eq x 0) 0) | |
1423 ((math-zerop x) '(float 0 0)) | |
1424 (calc-symbolic-mode (signal 'inexact-result nil)) | |
1425 ((Math-numberp x) | |
1426 (math-with-extra-prec 2 | |
1427 (let ((x (math-float x))) | |
1428 (if (and (eq (car x) 'float) | |
1429 (math-lessp-float x '(float 1 0)) | |
1430 (math-lessp-float '(float -1 0) x)) | |
1431 (math-exp-minus-1-raw x) | |
1432 (math-add (math-exp-raw x) -1))))) | |
1433 ((eq (car-safe x) 'sdev) | |
1434 (if (math-constp x) | |
1435 (let ((ex (calcFunc-expm1 (nth 1 x)))) | |
1436 (math-make-sdev ex (math-mul (nth 2 x) (math-add ex 1)))) | |
1437 (math-make-sdev (calcFunc-expm1 (nth 1 x)) | |
1438 (math-mul (nth 2 x) (calcFunc-exp (nth 1 x)))))) | |
1439 ((eq (car-safe x) 'intv) | |
1440 (math-make-intv (nth 1 x) | |
1441 (calcFunc-expm1 (nth 2 x)) | |
1442 (calcFunc-expm1 (nth 3 x)))) | |
1443 ((equal x '(var inf var-inf)) | |
1444 x) | |
1445 ((equal x '(neg (var inf var-inf))) | |
1446 -1) | |
1447 ((equal x '(var nan var-nan)) | |
1448 x) | |
1449 (t (calc-record-why 'numberp x) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1450 (list 'calcFunc-expm1 x)))) |
40785 | 1451 |
1452 (defun calcFunc-exp10 (x) ; [N N] [Public] | |
1453 (if (eq x 0) | |
1454 1 | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1455 (math-pow '(float 1 1) x))) |
40785 | 1456 |
1457 (defun math-exp-raw (x) ; [N N] | |
1458 (cond ((math-zerop x) '(float 1 0)) | |
1459 (calc-symbolic-mode (signal 'inexact-result nil)) | |
1460 ((eq (car x) 'cplx) | |
1461 (let ((expx (math-exp-raw (nth 1 x))) | |
1462 (sc (math-sin-cos-raw (nth 2 x)))) | |
1463 (list 'cplx | |
1464 (math-mul-float expx (cdr sc)) | |
1465 (math-mul-float expx (car sc))))) | |
1466 ((eq (car x) 'polar) | |
1467 (let ((xc (math-complex x))) | |
1468 (list 'polar | |
1469 (math-exp-raw (nth 1 xc)) | |
1470 (math-from-radians (nth 2 xc))))) | |
82015
0795e1e56274
(math-emacs-precision, math-largest-emacs-expt)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81746
diff
changeset
|
1471 ((math-use-emacs-fn 'exp x)) |
40785 | 1472 ((or (math-lessp-float '(float 5 -1) x) |
1473 (math-lessp-float x '(float -5 -1))) | |
1474 (if (math-lessp-float '(float 921035 1) x) | |
1475 (math-overflow) | |
1476 (if (math-lessp-float x '(float -921035 1)) | |
1477 (math-underflow))) | |
1478 (let* ((two-x (math-mul-float x '(float 2 0))) | |
1479 (hint (math-scale-int (nth 1 two-x) (nth 2 two-x))) | |
1480 (hfrac (math-sub-float x (math-mul-float (math-float hint) | |
1481 '(float 5 -1))))) | |
1482 (math-mul-float (math-ipow (math-sqrt-e) hint) | |
1483 (math-add-float '(float 1 0) | |
1484 (math-exp-minus-1-raw hfrac))))) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1485 (t (math-add-float '(float 1 0) (math-exp-minus-1-raw x))))) |
40785 | 1486 |
1487 (defun math-exp-minus-1-raw (x) ; [F F] | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1488 (math-exp-series x 2 3 x x)) |
40785 | 1489 |
1490 (defun math-exp-series (sum nfac n xpow x) | |
1491 (math-working "exp" sum) | |
1492 (let* ((nextx (math-mul-float xpow x)) | |
1493 (nextsum (math-add-float sum (math-div-float nextx | |
1494 (math-float nfac))))) | |
1495 (if (math-nearly-equal-float sum nextsum) | |
1496 sum | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1497 (math-exp-series nextsum (math-mul nfac n) (1+ n) nextx x)))) |
40785 | 1498 |
1499 | |
1500 | |
1501 ;;; Logarithms. | |
1502 | |
1503 (defun calcFunc-ln (x) ; [N N] [Public] | |
1504 (cond ((math-zerop x) | |
1505 (if calc-infinite-mode | |
1506 '(neg (var inf var-inf)) | |
1507 (math-reject-arg x "*Logarithm of zero"))) | |
1508 ((eq x 1) 0) | |
1509 ((Math-numberp x) | |
1510 (math-with-extra-prec 2 (math-ln-raw (math-float x)))) | |
1511 ((eq (car-safe x) 'sdev) | |
1512 (math-make-sdev (calcFunc-ln (nth 1 x)) | |
1513 (math-div (nth 2 x) (nth 1 x)))) | |
1514 ((and (eq (car-safe x) 'intv) (or (Math-posp (nth 2 x)) | |
1515 (Math-zerop (nth 2 x)) | |
1516 (not (math-intv-constp x)))) | |
1517 (let ((calc-infinite-mode t)) | |
1518 (math-make-intv (nth 1 x) (calcFunc-ln (nth 2 x)) | |
1519 (calcFunc-ln (nth 3 x))))) | |
1520 ((equal x '(var e var-e)) | |
1521 1) | |
1522 ((and (eq (car-safe x) '^) | |
1523 (equal (nth 1 x) '(var e var-e)) | |
1524 (math-known-realp (nth 2 x))) | |
1525 (nth 2 x)) | |
1526 ((math-infinitep x) | |
1527 (if (equal x '(var nan var-nan)) | |
1528 x | |
1529 '(var inf var-inf))) | |
1530 (t (calc-record-why 'numberp x) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1531 (list 'calcFunc-ln x)))) |
40785 | 1532 |
1533 (defun calcFunc-log10 (x) ; [N N] [Public] | |
1534 (cond ((math-equal-int x 1) | |
1535 (if (math-floatp x) '(float 0 0) 0)) | |
1536 ((and (Math-integerp x) | |
1537 (math-posp x) | |
1538 (let ((res (math-integer-log x 10))) | |
1539 (and (car res) | |
1540 (setq x (cdr res))))) | |
1541 x) | |
1542 ((and (eq (car-safe x) 'frac) | |
1543 (eq (nth 1 x) 1) | |
1544 (let ((res (math-integer-log (nth 2 x) 10))) | |
1545 (and (car res) | |
1546 (setq x (- (cdr res)))))) | |
1547 x) | |
1548 ((math-zerop x) | |
1549 (if calc-infinite-mode | |
1550 '(neg (var inf var-inf)) | |
1551 (math-reject-arg x "*Logarithm of zero"))) | |
1552 (calc-symbolic-mode (signal 'inexact-result nil)) | |
1553 ((Math-numberp x) | |
1554 (math-with-extra-prec 2 | |
1555 (let ((xf (math-float x))) | |
1556 (if (eq (nth 1 xf) 0) | |
1557 (math-reject-arg x "*Logarithm of zero")) | |
1558 (if (Math-integer-posp (nth 1 xf)) | |
1559 (if (eq (nth 1 xf) 1) ; log10(1*10^n) = n | |
1560 (math-float (nth 2 xf)) | |
1561 (let ((xdigs (1- (math-numdigs (nth 1 xf))))) | |
1562 (math-add-float | |
1563 (math-div-float (math-ln-raw-2 | |
1564 (list 'float (nth 1 xf) (- xdigs))) | |
1565 (math-ln-10)) | |
1566 (math-float (+ (nth 2 xf) xdigs))))) | |
1567 (math-div (calcFunc-ln xf) (math-ln-10)))))) | |
1568 ((eq (car-safe x) 'sdev) | |
1569 (math-make-sdev (calcFunc-log10 (nth 1 x)) | |
1570 (math-div (nth 2 x) | |
1571 (math-mul (nth 1 x) (math-ln-10))))) | |
1572 ((and (eq (car-safe x) 'intv) (or (Math-posp (nth 2 x)) | |
1573 (not (math-intv-constp x)))) | |
1574 (math-make-intv (nth 1 x) | |
1575 (calcFunc-log10 (nth 2 x)) | |
1576 (calcFunc-log10 (nth 3 x)))) | |
1577 ((math-infinitep x) | |
1578 (if (equal x '(var nan var-nan)) | |
1579 x | |
1580 '(var inf var-inf))) | |
1581 (t (calc-record-why 'numberp x) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1582 (list 'calcFunc-log10 x)))) |
40785 | 1583 |
1584 (defun calcFunc-log (x &optional b) ; [N N N] [Public] | |
1585 (cond ((or (null b) (equal b '(var e var-e))) | |
1586 (math-normalize (list 'calcFunc-ln x))) | |
1587 ((or (eq b 10) (equal b '(float 1 1))) | |
1588 (math-normalize (list 'calcFunc-log10 x))) | |
1589 ((math-zerop x) | |
1590 (if calc-infinite-mode | |
1591 (math-div (calcFunc-ln x) (calcFunc-ln b)) | |
1592 (math-reject-arg x "*Logarithm of zero"))) | |
1593 ((math-zerop b) | |
1594 (if calc-infinite-mode | |
1595 (math-div (calcFunc-ln x) (calcFunc-ln b)) | |
1596 (math-reject-arg b "*Logarithm of zero"))) | |
1597 ((math-equal-int b 1) | |
1598 (if calc-infinite-mode | |
1599 (math-div (calcFunc-ln x) 0) | |
1600 (math-reject-arg b "*Logarithm base one"))) | |
1601 ((math-equal-int x 1) | |
58475
647b2f6dac36
(math-nrf-n, math-nrf-nf, math-nrf-nfm1): New variables.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
1602 (if (math-floatp b) '(float 0 0) 0)) |
40785 | 1603 ((and (Math-ratp x) (Math-ratp b) |
1604 (math-posp x) (math-posp b) | |
1605 (let* ((sign 1) (inv nil) | |
1606 (xx (if (Math-lessp 1 x) | |
1607 x | |
1608 (setq sign -1) | |
1609 (math-div 1 x))) | |
1610 (bb (if (Math-lessp 1 b) | |
1611 b | |
1612 (setq sign (- sign)) | |
1613 (math-div 1 b))) | |
1614 (res (if (Math-lessp xx bb) | |
1615 (setq inv (math-integer-log bb xx)) | |
1616 (math-integer-log xx bb)))) | |
1617 (and (car res) | |
1618 (setq x (if inv | |
1619 (math-div 1 (* sign (cdr res))) | |
1620 (* sign (cdr res))))))) | |
1621 x) | |
1622 (calc-symbolic-mode (signal 'inexact-result nil)) | |
1623 ((and (Math-numberp x) (Math-numberp b)) | |
1624 (math-with-extra-prec 2 | |
1625 (math-div (math-ln-raw (math-float x)) | |
1626 (math-log-base-raw b)))) | |
1627 ((and (eq (car-safe x) 'sdev) | |
1628 (Math-numberp b)) | |
1629 (math-make-sdev (calcFunc-log (nth 1 x) b) | |
1630 (math-div (nth 2 x) | |
1631 (math-mul (nth 1 x) | |
1632 (math-log-base-raw b))))) | |
1633 ((and (eq (car-safe x) 'intv) (or (Math-posp (nth 2 x)) | |
1634 (not (math-intv-constp x))) | |
1635 (math-realp b)) | |
1636 (math-make-intv (nth 1 x) | |
1637 (calcFunc-log (nth 2 x) b) | |
1638 (calcFunc-log (nth 3 x) b))) | |
1639 ((or (eq (car-safe x) 'intv) (eq (car-safe b) 'intv)) | |
1640 (math-div (calcFunc-ln x) (calcFunc-ln b))) | |
1641 ((or (math-infinitep x) | |
1642 (math-infinitep b)) | |
1643 (math-div (calcFunc-ln x) (calcFunc-ln b))) | |
1644 (t (if (Math-numberp b) | |
1645 (calc-record-why 'numberp x) | |
1646 (calc-record-why 'numberp b)) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1647 (list 'calcFunc-log x b)))) |
40785 | 1648 |
1649 (defun calcFunc-alog (x &optional b) | |
1650 (cond ((or (null b) (equal b '(var e var-e))) | |
1651 (math-normalize (list 'calcFunc-exp x))) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1652 (t (math-pow b x)))) |
40785 | 1653 |
1654 (defun calcFunc-ilog (x b) | |
1655 (if (and (math-natnump x) (not (eq x 0)) | |
1656 (math-natnump b) (not (eq b 0))) | |
1657 (if (eq b 1) | |
1658 (math-reject-arg x "*Logarithm base one") | |
1659 (if (Math-natnum-lessp x b) | |
1660 0 | |
1661 (cdr (math-integer-log x b)))) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1662 (math-floor (calcFunc-log x b)))) |
40785 | 1663 |
1664 (defun math-integer-log (x b) | |
1665 (let ((pows (list b)) | |
1666 (pow (math-sqr b)) | |
1667 next | |
1668 sum n) | |
1669 (while (not (Math-lessp x pow)) | |
1670 (setq pows (cons pow pows) | |
1671 pow (math-sqr pow))) | |
1672 (setq n (lsh 1 (1- (length pows))) | |
1673 sum n | |
1674 pow (car pows)) | |
1675 (while (and (setq pows (cdr pows)) | |
1676 (Math-lessp pow x)) | |
1677 (setq n (/ n 2) | |
1678 next (math-mul pow (car pows))) | |
1679 (or (Math-lessp x next) | |
1680 (setq pow next | |
1681 sum (+ sum n)))) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1682 (cons (equal pow x) sum))) |
40785 | 1683 |
1684 | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41044
diff
changeset
|
1685 (defvar math-log-base-cache nil) |
40785 | 1686 (defun math-log-base-raw (b) ; [N N] |
1687 (if (not (and (equal (car math-log-base-cache) b) | |
1688 (eq (nth 1 math-log-base-cache) calc-internal-prec))) | |
1689 (setq math-log-base-cache (list b calc-internal-prec | |
1690 (math-ln-raw (math-float b))))) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1691 (nth 2 math-log-base-cache)) |
40785 | 1692 |
1693 (defun calcFunc-lnp1 (x) ; [N N] [Public] | |
1694 (cond ((Math-equal-int x -1) | |
1695 (if calc-infinite-mode | |
1696 '(neg (var inf var-inf)) | |
1697 (math-reject-arg x "*Logarithm of zero"))) | |
1698 ((eq x 0) 0) | |
1699 ((math-zerop x) '(float 0 0)) | |
1700 (calc-symbolic-mode (signal 'inexact-result nil)) | |
1701 ((Math-numberp x) | |
1702 (math-with-extra-prec 2 | |
1703 (let ((x (math-float x))) | |
1704 (if (and (eq (car x) 'float) | |
1705 (math-lessp-float x '(float 5 -1)) | |
1706 (math-lessp-float '(float -5 -1) x)) | |
1707 (math-ln-plus-1-raw x) | |
1708 (math-ln-raw (math-add-float x '(float 1 0))))))) | |
1709 ((eq (car-safe x) 'sdev) | |
1710 (math-make-sdev (calcFunc-lnp1 (nth 1 x)) | |
1711 (math-div (nth 2 x) (math-add (nth 1 x) 1)))) | |
1712 ((and (eq (car-safe x) 'intv) (or (Math-posp (nth 2 x)) | |
1713 (not (math-intv-constp x)))) | |
1714 (math-make-intv (nth 1 x) | |
1715 (calcFunc-lnp1 (nth 2 x)) | |
1716 (calcFunc-lnp1 (nth 3 x)))) | |
1717 ((math-infinitep x) | |
1718 (if (equal x '(var nan var-nan)) | |
1719 x | |
1720 '(var inf var-inf))) | |
1721 (t (calc-record-why 'numberp x) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1722 (list 'calcFunc-lnp1 x)))) |
40785 | 1723 |
1724 (defun math-ln-raw (x) ; [N N] --- must be float format! | |
1725 (cond ((eq (car-safe x) 'cplx) | |
1726 (list 'cplx | |
1727 (math-mul-float (math-ln-raw | |
1728 (math-add-float (math-sqr-float (nth 1 x)) | |
1729 (math-sqr-float (nth 2 x)))) | |
1730 '(float 5 -1)) | |
1731 (math-arctan2-raw (nth 2 x) (nth 1 x)))) | |
1732 ((eq (car x) 'polar) | |
1733 (math-polar (list 'cplx | |
1734 (math-ln-raw (nth 1 x)) | |
1735 (math-to-radians (nth 2 x))))) | |
1736 ((Math-equal-int x 1) | |
1737 '(float 0 0)) | |
1738 (calc-symbolic-mode (signal 'inexact-result nil)) | |
1739 ((math-posp (nth 1 x)) ; positive and real | |
1740 (let ((xdigs (1- (math-numdigs (nth 1 x))))) | |
1741 (math-add-float (math-ln-raw-2 (list 'float (nth 1 x) (- xdigs))) | |
1742 (math-mul-float (math-float (+ (nth 2 x) xdigs)) | |
1743 (math-ln-10))))) | |
1744 ((math-zerop x) | |
1745 (math-reject-arg x "*Logarithm of zero")) | |
1746 ((eq calc-complex-mode 'polar) ; negative and real | |
1747 (math-polar | |
1748 (list 'cplx ; negative and real | |
1749 (math-ln-raw (math-neg-float x)) | |
1750 (math-pi)))) | |
1751 (t (list 'cplx ; negative and real | |
1752 (math-ln-raw (math-neg-float x)) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1753 (math-pi))))) |
40785 | 1754 |
1755 (defun math-ln-raw-2 (x) ; [F F] | |
1756 (cond ((math-lessp-float '(float 14 -1) x) | |
1757 (math-add-float (math-ln-raw-2 (math-mul-float x '(float 5 -1))) | |
1758 (math-ln-2))) | |
1759 (t ; now .7 < x <= 1.4 | |
1760 (math-ln-raw-3 (math-div-float (math-sub-float x '(float 1 0)) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1761 (math-add-float x '(float 1 0))))))) |
40785 | 1762 |
1763 (defun math-ln-raw-3 (x) ; [F F] | |
1764 (math-mul-float (math-ln-raw-series x 3 x (math-sqr-float x)) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1765 '(float 2 0))) |
40785 | 1766 |
1767 ;;; Compute ln((1+x)/(1-x)) | |
1768 (defun math-ln-raw-series (sum n x xsqr) | |
1769 (math-working "log" sum) | |
1770 (let* ((nextx (math-mul-float x xsqr)) | |
1771 (nextsum (math-add-float sum (math-div-float nextx (math-float n))))) | |
1772 (if (math-nearly-equal-float sum nextsum) | |
1773 sum | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1774 (math-ln-raw-series nextsum (+ n 2) nextx xsqr)))) |
40785 | 1775 |
1776 (defun math-ln-plus-1-raw (x) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1777 (math-lnp1-series x 2 x (math-neg x))) |
40785 | 1778 |
1779 (defun math-lnp1-series (sum n xpow x) | |
1780 (math-working "lnp1" sum) | |
1781 (let* ((nextx (math-mul-float xpow x)) | |
1782 (nextsum (math-add-float sum (math-div-float nextx (math-float n))))) | |
1783 (if (math-nearly-equal-float sum nextsum) | |
1784 sum | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1785 (math-lnp1-series nextsum (1+ n) nextx x)))) |
40785 | 1786 |
81549
95971e0a7e98
(math-approx-ln-10, math-approx-ln-2): New variables to use in caches.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
77465
diff
changeset
|
1787 (defconst math-approx-ln-10 |
95971e0a7e98
(math-approx-ln-10, math-approx-ln-2): New variables to use in caches.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
77465
diff
changeset
|
1788 (eval-when-compile |
81746
71ae866366dc
(math-approx-ln-10,math-approx-ln-2): Add docstrings.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81597
diff
changeset
|
1789 (math-read-number-simple "2.302585092994045684018")) |
71ae866366dc
(math-approx-ln-10,math-approx-ln-2): Add docstrings.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81597
diff
changeset
|
1790 "An approximation for ln(10).") |
81549
95971e0a7e98
(math-approx-ln-10, math-approx-ln-2): New variables to use in caches.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
77465
diff
changeset
|
1791 |
95971e0a7e98
(math-approx-ln-10, math-approx-ln-2): New variables to use in caches.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
77465
diff
changeset
|
1792 (math-defcache math-ln-10 math-approx-ln-10 |
40785 | 1793 (math-ln-raw-2 '(float 1 1))) |
1794 | |
81549
95971e0a7e98
(math-approx-ln-10, math-approx-ln-2): New variables to use in caches.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
77465
diff
changeset
|
1795 (defconst math-approx-ln-2 |
95971e0a7e98
(math-approx-ln-10, math-approx-ln-2): New variables to use in caches.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
77465
diff
changeset
|
1796 (eval-when-compile |
81746
71ae866366dc
(math-approx-ln-10,math-approx-ln-2): Add docstrings.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81597
diff
changeset
|
1797 (math-read-number-simple "0.693147180559945309417")) |
71ae866366dc
(math-approx-ln-10,math-approx-ln-2): Add docstrings.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
81597
diff
changeset
|
1798 "An approximation for ln(2).") |
81549
95971e0a7e98
(math-approx-ln-10, math-approx-ln-2): New variables to use in caches.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
77465
diff
changeset
|
1799 |
95971e0a7e98
(math-approx-ln-10, math-approx-ln-2): New variables to use in caches.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
77465
diff
changeset
|
1800 (math-defcache math-ln-2 math-approx-ln-2 |
40785 | 1801 (math-ln-raw-3 (math-float '(frac 1 3)))) |
1802 | |
1803 | |
1804 | |
1805 ;;; Hyperbolic functions. | |
1806 | |
1807 (defun calcFunc-sinh (x) ; [N N] [Public] | |
1808 (cond ((eq x 0) 0) | |
1809 (math-expand-formulas | |
1810 (math-normalize | |
1811 (list '/ (list '- (list 'calcFunc-exp x) | |
1812 (list 'calcFunc-exp (list 'neg x))) 2))) | |
1813 ((Math-numberp x) | |
1814 (if calc-symbolic-mode (signal 'inexact-result nil)) | |
1815 (math-with-extra-prec 2 | |
1816 (let ((expx (math-exp-raw (math-float x)))) | |
1817 (math-mul (math-add expx (math-div -1 expx)) '(float 5 -1))))) | |
1818 ((eq (car-safe x) 'sdev) | |
1819 (math-make-sdev (calcFunc-sinh (nth 1 x)) | |
1820 (math-mul (nth 2 x) (calcFunc-cosh (nth 1 x))))) | |
1821 ((eq (car x) 'intv) | |
1822 (math-sort-intv (nth 1 x) | |
1823 (calcFunc-sinh (nth 2 x)) | |
1824 (calcFunc-sinh (nth 3 x)))) | |
1825 ((or (equal x '(var inf var-inf)) | |
1826 (equal x '(neg (var inf var-inf))) | |
1827 (equal x '(var nan var-nan))) | |
1828 x) | |
1829 (t (calc-record-why 'numberp x) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1830 (list 'calcFunc-sinh x)))) |
40785 | 1831 (put 'calcFunc-sinh 'math-expandable t) |
1832 | |
1833 (defun calcFunc-cosh (x) ; [N N] [Public] | |
1834 (cond ((eq x 0) 1) | |
1835 (math-expand-formulas | |
1836 (math-normalize | |
1837 (list '/ (list '+ (list 'calcFunc-exp x) | |
1838 (list 'calcFunc-exp (list 'neg x))) 2))) | |
1839 ((Math-numberp x) | |
1840 (if calc-symbolic-mode (signal 'inexact-result nil)) | |
1841 (math-with-extra-prec 2 | |
1842 (let ((expx (math-exp-raw (math-float x)))) | |
1843 (math-mul (math-add expx (math-div 1 expx)) '(float 5 -1))))) | |
1844 ((eq (car-safe x) 'sdev) | |
1845 (math-make-sdev (calcFunc-cosh (nth 1 x)) | |
1846 (math-mul (nth 2 x) | |
1847 (calcFunc-sinh (nth 1 x))))) | |
1848 ((and (eq (car x) 'intv) (math-intv-constp x)) | |
1849 (setq x (math-abs x)) | |
1850 (math-sort-intv (nth 1 x) | |
1851 (calcFunc-cosh (nth 2 x)) | |
1852 (calcFunc-cosh (nth 3 x)))) | |
1853 ((or (equal x '(var inf var-inf)) | |
1854 (equal x '(neg (var inf var-inf))) | |
1855 (equal x '(var nan var-nan))) | |
1856 (math-abs x)) | |
1857 (t (calc-record-why 'numberp x) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1858 (list 'calcFunc-cosh x)))) |
40785 | 1859 (put 'calcFunc-cosh 'math-expandable t) |
1860 | |
1861 (defun calcFunc-tanh (x) ; [N N] [Public] | |
1862 (cond ((eq x 0) 0) | |
1863 (math-expand-formulas | |
1864 (math-normalize | |
1865 (let ((expx (list 'calcFunc-exp x)) | |
1866 (expmx (list 'calcFunc-exp (list 'neg x)))) | |
1867 (math-normalize | |
1868 (list '/ (list '- expx expmx) (list '+ expx expmx)))))) | |
1869 ((Math-numberp x) | |
1870 (if calc-symbolic-mode (signal 'inexact-result nil)) | |
1871 (math-with-extra-prec 2 | |
1872 (let* ((expx (calcFunc-exp (math-float x))) | |
1873 (expmx (math-div 1 expx))) | |
1874 (math-div (math-sub expx expmx) | |
1875 (math-add expx expmx))))) | |
1876 ((eq (car-safe x) 'sdev) | |
1877 (math-make-sdev (calcFunc-tanh (nth 1 x)) | |
1878 (math-div (nth 2 x) | |
1879 (math-sqr (calcFunc-cosh (nth 1 x)))))) | |
1880 ((eq (car x) 'intv) | |
1881 (math-sort-intv (nth 1 x) | |
1882 (calcFunc-tanh (nth 2 x)) | |
1883 (calcFunc-tanh (nth 3 x)))) | |
1884 ((equal x '(var inf var-inf)) | |
1885 1) | |
1886 ((equal x '(neg (var inf var-inf))) | |
1887 -1) | |
1888 ((equal x '(var nan var-nan)) | |
1889 x) | |
1890 (t (calc-record-why 'numberp x) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1891 (list 'calcFunc-tanh x)))) |
40785 | 1892 (put 'calcFunc-tanh 'math-expandable t) |
1893 | |
60079
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1894 (defun calcFunc-sech (x) ; [N N] [Public] |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1895 (cond ((eq x 0) 1) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1896 (math-expand-formulas |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1897 (math-normalize |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1898 (list '/ 2 (list '+ (list 'calcFunc-exp x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1899 (list 'calcFunc-exp (list 'neg x)))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1900 ((Math-numberp x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1901 (if calc-symbolic-mode (signal 'inexact-result nil)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1902 (math-with-extra-prec 2 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1903 (let ((expx (math-exp-raw (math-float x)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1904 (math-div '(float 2 0) (math-add expx (math-div 1 expx)))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1905 ((eq (car-safe x) 'sdev) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1906 (math-make-sdev (calcFunc-sech (nth 1 x)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1907 (math-mul (nth 2 x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1908 (math-mul (calcFunc-sech (nth 1 x)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1909 (calcFunc-tanh (nth 1 x)))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1910 ((and (eq (car x) 'intv) (math-intv-constp x)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1911 (setq x (math-abs x)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1912 (math-sort-intv (nth 1 x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1913 (calcFunc-sech (nth 2 x)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1914 (calcFunc-sech (nth 3 x)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1915 ((or (equal x '(var inf var-inf)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1916 (equal x '(neg (var inf var-inf)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1917 0) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1918 ((equal x '(var nan var-nan)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1919 x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1920 (t (calc-record-why 'numberp x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1921 (list 'calcFunc-sech x)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1922 (put 'calcFunc-sech 'math-expandable t) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1923 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1924 (defun calcFunc-csch (x) ; [N N] [Public] |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1925 (cond ((eq x 0) (math-div 1 0)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1926 (math-expand-formulas |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1927 (math-normalize |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1928 (list '/ 2 (list '- (list 'calcFunc-exp x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1929 (list 'calcFunc-exp (list 'neg x)))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1930 ((Math-numberp x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1931 (if calc-symbolic-mode (signal 'inexact-result nil)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1932 (math-with-extra-prec 2 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1933 (let ((expx (math-exp-raw (math-float x)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1934 (math-div '(float 2 0) (math-add expx (math-div -1 expx)))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1935 ((eq (car-safe x) 'sdev) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1936 (math-make-sdev (calcFunc-csch (nth 1 x)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1937 (math-mul (nth 2 x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1938 (math-mul (calcFunc-csch (nth 1 x)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1939 (calcFunc-coth (nth 1 x)))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1940 ((eq (car x) 'intv) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1941 (if (and (Math-negp (nth 2 x)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1942 (Math-posp (nth 3 x))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1943 '(intv 3 (neg (var inf var-inf)) (var inf var-inf)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1944 (math-sort-intv (nth 1 x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1945 (calcFunc-csch (nth 2 x)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1946 (calcFunc-csch (nth 3 x))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1947 ((or (equal x '(var inf var-inf)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1948 (equal x '(neg (var inf var-inf)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1949 0) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1950 ((equal x '(var nan var-nan)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1951 x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1952 (t (calc-record-why 'numberp x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1953 (list 'calcFunc-csch x)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1954 (put 'calcFunc-csch 'math-expandable t) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1955 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1956 (defun calcFunc-coth (x) ; [N N] [Public] |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1957 (cond ((eq x 0) (math-div 1 0)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1958 (math-expand-formulas |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1959 (math-normalize |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1960 (let ((expx (list 'calcFunc-exp x)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1961 (expmx (list 'calcFunc-exp (list 'neg x)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1962 (math-normalize |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1963 (list '/ (list '+ expx expmx) (list '- expx expmx)))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1964 ((Math-numberp x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1965 (if calc-symbolic-mode (signal 'inexact-result nil)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1966 (math-with-extra-prec 2 |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1967 (let* ((expx (calcFunc-exp (math-float x))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1968 (expmx (math-div 1 expx))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1969 (math-div (math-add expx expmx) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1970 (math-sub expx expmx))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1971 ((eq (car-safe x) 'sdev) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1972 (math-make-sdev (calcFunc-coth (nth 1 x)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1973 (math-div (nth 2 x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1974 (math-sqr (calcFunc-sinh (nth 1 x)))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1975 ((eq (car x) 'intv) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1976 (if (and (Math-negp (nth 2 x)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1977 (Math-posp (nth 3 x))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1978 '(intv 3 (neg (var inf var-inf)) (var inf var-inf)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1979 (math-sort-intv (nth 1 x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1980 (calcFunc-coth (nth 2 x)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1981 (calcFunc-coth (nth 3 x))))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1982 ((equal x '(var inf var-inf)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1983 1) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1984 ((equal x '(neg (var inf var-inf))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1985 -1) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1986 ((equal x '(var nan var-nan)) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1987 x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1988 (t (calc-record-why 'numberp x) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1989 (list 'calcFunc-coth x)))) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1990 (put 'calcFunc-coth 'math-expandable t) |
b676ef11ff65
(calc-sec, calc-csc, calc-cot, calc-sech, calc-csch, calc-coth)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58663
diff
changeset
|
1991 |
40785 | 1992 (defun calcFunc-arcsinh (x) ; [N N] [Public] |
1993 (cond ((eq x 0) 0) | |
1994 (math-expand-formulas | |
1995 (math-normalize | |
1996 (list 'calcFunc-ln (list '+ x (list 'calcFunc-sqrt | |
1997 (list '+ (list '^ x 2) 1)))))) | |
1998 ((Math-numberp x) | |
1999 (if calc-symbolic-mode (signal 'inexact-result nil)) | |
2000 (math-with-extra-prec 2 | |
2001 (math-ln-raw (math-add x (math-sqrt-raw (math-add (math-sqr x) | |
2002 '(float 1 0))))))) | |
2003 ((eq (car-safe x) 'sdev) | |
2004 (math-make-sdev (calcFunc-arcsinh (nth 1 x)) | |
2005 (math-div (nth 2 x) | |
2006 (math-sqrt | |
2007 (math-add (math-sqr (nth 1 x)) 1))))) | |
2008 ((eq (car x) 'intv) | |
2009 (math-sort-intv (nth 1 x) | |
2010 (calcFunc-arcsinh (nth 2 x)) | |
2011 (calcFunc-arcsinh (nth 3 x)))) | |
2012 ((or (equal x '(var inf var-inf)) | |
2013 (equal x '(neg (var inf var-inf))) | |
2014 (equal x '(var nan var-nan))) | |
2015 x) | |
2016 (t (calc-record-why 'numberp x) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
2017 (list 'calcFunc-arcsinh x)))) |
40785 | 2018 (put 'calcFunc-arcsinh 'math-expandable t) |
2019 | |
2020 (defun calcFunc-arccosh (x) ; [N N] [Public] | |
2021 (cond ((eq x 1) 0) | |
2022 ((and (eq x -1) calc-symbolic-mode) | |
2023 '(var pi var-pi)) | |
2024 ((and (eq x 0) calc-symbolic-mode) | |
2025 (math-div (math-mul '(var pi var-pi) '(var i var-i)) 2)) | |
2026 (math-expand-formulas | |
2027 (math-normalize | |
2028 (list 'calcFunc-ln (list '+ x (list 'calcFunc-sqrt | |
2029 (list '- (list '^ x 2) 1)))))) | |
2030 ((Math-numberp x) | |
2031 (if calc-symbolic-mode (signal 'inexact-result nil)) | |
2032 (if (Math-equal-int x -1) | |
2033 (math-imaginary (math-pi)) | |
2034 (math-with-extra-prec 2 | |
2035 (if (or t ; need to do this even in the real case! | |
2036 (memq (car-safe x) '(cplx polar))) | |
2037 (let ((xp1 (math-add 1 x))) ; this gets the branch cuts right | |
2038 (math-ln-raw | |
2039 (math-add x (math-mul xp1 | |
2040 (math-sqrt-raw | |
2041 (math-div (math-sub | |
2042 x | |
2043 '(float 1 0)) | |
2044 xp1)))))) | |
2045 (math-ln-raw | |
2046 (math-add x (math-sqrt-raw (math-add (math-sqr x) | |
2047 '(float -1 0))))))))) | |
2048 ((eq (car-safe x) 'sdev) | |
2049 (math-make-sdev (calcFunc-arccosh (nth 1 x)) | |
2050 (math-div (nth 2 x) | |
2051 (math-sqrt | |
2052 (math-add (math-sqr (nth 1 x)) -1))))) | |
2053 ((eq (car x) 'intv) | |
2054 (math-sort-intv (nth 1 x) | |
2055 (calcFunc-arccosh (nth 2 x)) | |
2056 (calcFunc-arccosh (nth 3 x)))) | |
2057 ((or (equal x '(var inf var-inf)) | |
2058 (equal x '(neg (var inf var-inf))) | |
2059 (equal x '(var nan var-nan))) | |
2060 x) | |
2061 (t (calc-record-why 'numberp x) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
2062 (list 'calcFunc-arccosh x)))) |
40785 | 2063 (put 'calcFunc-arccosh 'math-expandable t) |
2064 | |
2065 (defun calcFunc-arctanh (x) ; [N N] [Public] | |
2066 (cond ((eq x 0) 0) | |
2067 ((and (Math-equal-int x 1) calc-infinite-mode) | |
2068 '(var inf var-inf)) | |
2069 ((and (Math-equal-int x -1) calc-infinite-mode) | |
2070 '(neg (var inf var-inf))) | |
2071 (math-expand-formulas | |
2072 (list '/ (list '- | |
2073 (list 'calcFunc-ln (list '+ 1 x)) | |
2074 (list 'calcFunc-ln (list '- 1 x))) 2)) | |
2075 ((Math-numberp x) | |
2076 (if calc-symbolic-mode (signal 'inexact-result nil)) | |
2077 (math-with-extra-prec 2 | |
2078 (if (or (memq (car-safe x) '(cplx polar)) | |
2079 (Math-lessp 1 x)) | |
2080 (math-mul (math-sub (math-ln-raw (math-add '(float 1 0) x)) | |
2081 (math-ln-raw (math-sub '(float 1 0) x))) | |
2082 '(float 5 -1)) | |
2083 (if (and (math-equal-int x 1) calc-infinite-mode) | |
2084 '(var inf var-inf) | |
2085 (if (and (math-equal-int x -1) calc-infinite-mode) | |
2086 '(neg (var inf var-inf)) | |
2087 (math-mul (math-ln-raw (math-div (math-add '(float 1 0) x) | |
2088 (math-sub 1 x))) | |
2089 '(float 5 -1))))))) | |
2090 ((eq (car-safe x) 'sdev) | |
2091 (math-make-sdev (calcFunc-arctanh (nth 1 x)) | |
2092 (math-div (nth 2 x) | |
2093 (math-sub 1 (math-sqr (nth 1 x)))))) | |
2094 ((eq (car x) 'intv) | |
2095 (math-sort-intv (nth 1 x) | |
2096 (calcFunc-arctanh (nth 2 x)) | |
2097 (calcFunc-arctanh (nth 3 x)))) | |
2098 ((equal x '(var nan var-nan)) | |
2099 x) | |
2100 (t (calc-record-why 'numberp x) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
2101 (list 'calcFunc-arctanh x)))) |
40785 | 2102 (put 'calcFunc-arctanh 'math-expandable t) |
2103 | |
2104 | |
2105 ;;; Convert A from HMS or degrees to radians. | |
2106 (defun calcFunc-rad (a) ; [R R] [Public] | |
2107 (cond ((or (Math-numberp a) | |
2108 (eq (car a) 'intv)) | |
2109 (math-with-extra-prec 2 | |
2110 (math-mul a (math-pi-over-180)))) | |
2111 ((eq (car a) 'hms) | |
2112 (math-from-hms a 'rad)) | |
2113 ((eq (car a) 'sdev) | |
2114 (math-make-sdev (calcFunc-rad (nth 1 a)) | |
2115 (calcFunc-rad (nth 2 a)))) | |
2116 (math-expand-formulas | |
2117 (math-div (math-mul a '(var pi var-pi)) 180)) | |
2118 ((math-infinitep a) a) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
2119 (t (list 'calcFunc-rad a)))) |
40785 | 2120 (put 'calcFunc-rad 'math-expandable t) |
2121 | |
2122 ;;; Convert A from HMS or radians to degrees. | |
2123 (defun calcFunc-deg (a) ; [R R] [Public] | |
2124 (cond ((or (Math-numberp a) | |
2125 (eq (car a) 'intv)) | |
2126 (math-with-extra-prec 2 | |
2127 (math-div a (math-pi-over-180)))) | |
2128 ((eq (car a) 'hms) | |
2129 (math-from-hms a 'deg)) | |
2130 ((eq (car a) 'sdev) | |
2131 (math-make-sdev (calcFunc-deg (nth 1 a)) | |
2132 (calcFunc-deg (nth 2 a)))) | |
2133 (math-expand-formulas | |
2134 (math-div (math-mul 180 a) '(var pi var-pi))) | |
2135 ((math-infinitep a) a) | |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
2136 (t (list 'calcFunc-deg a)))) |
40785 | 2137 (put 'calcFunc-deg 'math-expandable t) |
2138 | |
58663
7ed196c06460
Add a provide statement.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58475
diff
changeset
|
2139 (provide 'calc-math) |
7ed196c06460
Add a provide statement.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58475
diff
changeset
|
2140 |
52401 | 2141 ;;; arch-tag: c7367e8e-d0b8-4f70-8577-2fb3f31dbb4c |
41044
4549dec29728
(calcFunc-sqrt, calcFunc-hypot): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
2142 ;;; calc-math.el ends here |