Mercurial > emacs
annotate lisp/calc/calc-frac.el @ 109026:c138aa96dae8
Add preliminary describe-package functionality, and some cleanup.
* help-mode.el (help-package-def): New button type.
* menu-bar.el: Move package-list-packages binding here from
package.el.
* emacs-lisp/package.el: Move package-list-packages binding to
menu-bar.el.
(describe-package, describe-package-1, package--dir): New funs.
(package-activate-1): Use package--dir.
* emacs-lisp/package-x.el (gnus-article-buffer): Require package.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sat, 19 Jun 2010 18:36:51 -0400 |
parents | 84df551e8c64 |
children | 417b1e4d63cd |
rev | line source |
---|---|
41264
0759b2de09c1
(calc-over-notation): Use `completing-read'.
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
1 ;;; calc-frac.el --- fraction functions for Calc |
0759b2de09c1
(calc-over-notation): Use `completing-read'.
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
2 |
64325
1db49616ce05
Update copyright information.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
62036
diff
changeset
|
3 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, |
106815 | 4 ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
40785 | 5 |
41264
0759b2de09c1
(calc-over-notation): Use `completing-read'.
Colin Walters <walters@gnu.org>
parents:
41047
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 |
41384
5b80d417cf80
"This file is part of GNU Emacs." added.
Pavel Janík <Pavel@Janik.cz>
parents:
41264
diff
changeset
|
9 ;; This file is part of GNU Emacs. |
5b80d417cf80
"This file is part of GNU Emacs." added.
Pavel Janík <Pavel@Janik.cz>
parents:
41264
diff
changeset
|
10 |
94654
6c9af2bfcfee
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
11 ;; GNU Emacs is free software: you can redistribute it and/or modify |
76595
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 |
94654
6c9af2bfcfee
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
13 ;; the Free Software Foundation, either version 3 of the License, or |
6c9af2bfcfee
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
14 ;; (at your option) 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 |
94654
6c9af2bfcfee
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
40785 | 23 |
41264
0759b2de09c1
(calc-over-notation): Use `completing-read'.
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
24 ;;; Commentary: |
40785 | 25 |
41264
0759b2de09c1
(calc-over-notation): Use `completing-read'.
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
26 ;;; Code: |
40785 | 27 |
28 ;; This file is autoloaded from calc-ext.el. | |
58655
4683e1bb5445
Add a provide statement.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57848
diff
changeset
|
29 |
40785 | 30 (require 'calc-ext) |
31 (require 'calc-macs) | |
32 | |
33 (defun calc-fdiv (arg) | |
34 (interactive "P") | |
35 (calc-slow-wrapper | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
36 (calc-binary-op ":" 'calcFunc-fdiv arg 1))) |
40785 | 37 |
38 | |
39 (defun calc-fraction (arg) | |
40 (interactive "P") | |
41 (calc-slow-wrapper | |
42 (let ((func (if (calc-is-hyperbolic) 'calcFunc-frac 'calcFunc-pfrac))) | |
43 (if (eq arg 0) | |
44 (calc-enter-result 2 "frac" (list func | |
45 (calc-top-n 2) | |
46 (calc-top-n 1))) | |
47 (calc-enter-result 1 "frac" (list func | |
48 (calc-top-n 1) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
49 (prefix-numeric-value (or arg 0)))))))) |
40785 | 50 |
51 | |
52 (defun calc-over-notation (fmt) | |
57848
28443b8e3b48
(calc-over-notation): Replaced `completing-read' with
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
53 (interactive "sFraction separator: ") |
40785 | 54 (calc-wrapper |
55 (if (string-match "\\`\\([^ 0-9][^ 0-9]?\\)[0-9]*\\'" fmt) | |
56 (let ((n nil)) | |
57 (if (/= (match-end 0) (match-end 1)) | |
62036
e0224a91347d
(calc-over-notation): Replace string-to-int by string-to-number.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58655
diff
changeset
|
58 (setq n (string-to-number (substring fmt (match-end 1))) |
40785 | 59 fmt (math-match-substring fmt 1))) |
60 (if (eq n 0) (error "Bad denominator")) | |
61 (calc-change-mode 'calc-frac-format (list fmt n) t)) | |
41264
0759b2de09c1
(calc-over-notation): Use `completing-read'.
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
62 (error "Bad fraction separator format")))) |
40785 | 63 |
64 (defun calc-slash-notation (n) | |
65 (interactive "P") | |
66 (calc-wrapper | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
67 (calc-change-mode 'calc-frac-format (if n '("//" nil) '("/" nil)) t))) |
40785 | 68 |
69 | |
70 (defun calc-frac-mode (n) | |
71 (interactive "P") | |
72 (calc-wrapper | |
73 (calc-change-mode 'calc-prefer-frac n nil t) | |
74 (message (if calc-prefer-frac | |
41264
0759b2de09c1
(calc-over-notation): Use `completing-read'.
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
75 "Integer division will now generate fractions" |
0759b2de09c1
(calc-over-notation): Use `completing-read'.
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
76 "Integer division will now generate floating-point results")))) |
40785 | 77 |
78 | |
79 ;;;; Fractions. | |
80 | |
81 ;;; Build a normalized fraction. [R I I] | |
82 ;;; (This could probably be implemented more efficiently than using | |
83 ;;; the plain gcd algorithm.) | |
84 (defun math-make-frac (num den) | |
85 (if (Math-integer-negp den) | |
86 (setq num (math-neg num) | |
87 den (math-neg den))) | |
88 (let ((gcd (math-gcd num den))) | |
89 (if (eq gcd 1) | |
90 (if (eq den 1) | |
91 num | |
92 (list 'frac num den)) | |
93 (if (equal gcd den) | |
94 (math-quotient num gcd) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
95 (list 'frac (math-quotient num gcd) (math-quotient den gcd)))))) |
40785 | 96 |
97 (defun calc-add-fractions (a b) | |
98 (if (eq (car-safe a) 'frac) | |
99 (if (eq (car-safe b) 'frac) | |
100 (math-make-frac (math-add (math-mul (nth 1 a) (nth 2 b)) | |
101 (math-mul (nth 2 a) (nth 1 b))) | |
102 (math-mul (nth 2 a) (nth 2 b))) | |
103 (math-make-frac (math-add (nth 1 a) | |
104 (math-mul (nth 2 a) b)) | |
105 (nth 2 a))) | |
106 (math-make-frac (math-add (math-mul a (nth 2 b)) | |
107 (nth 1 b)) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
108 (nth 2 b)))) |
40785 | 109 |
110 (defun calc-mul-fractions (a b) | |
111 (if (eq (car-safe a) 'frac) | |
112 (if (eq (car-safe b) 'frac) | |
113 (math-make-frac (math-mul (nth 1 a) (nth 1 b)) | |
114 (math-mul (nth 2 a) (nth 2 b))) | |
115 (math-make-frac (math-mul (nth 1 a) b) | |
116 (nth 2 a))) | |
117 (math-make-frac (math-mul a (nth 1 b)) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
118 (nth 2 b)))) |
40785 | 119 |
120 (defun calc-div-fractions (a b) | |
121 (if (eq (car-safe a) 'frac) | |
122 (if (eq (car-safe b) 'frac) | |
123 (math-make-frac (math-mul (nth 1 a) (nth 2 b)) | |
124 (math-mul (nth 2 a) (nth 1 b))) | |
125 (math-make-frac (nth 1 a) | |
126 (math-mul (nth 2 a) b))) | |
127 (math-make-frac (math-mul a (nth 2 b)) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
128 (nth 1 b)))) |
40785 | 129 |
130 | |
131 ;;; Convert a real value to fractional form. [T R I; T R F] [Public] | |
132 (defun calcFunc-frac (a &optional tol) | |
133 (or tol (setq tol 0)) | |
134 (cond ((Math-ratp a) | |
135 a) | |
136 ((memq (car a) '(cplx polar vec hms date sdev intv mod)) | |
137 (cons (car a) (mapcar (function | |
138 (lambda (x) | |
139 (calcFunc-frac x tol))) | |
140 (cdr a)))) | |
141 ((Math-messy-integerp a) | |
142 (math-trunc a)) | |
143 ((Math-negp a) | |
144 (math-neg (calcFunc-frac (math-neg a) tol))) | |
145 ((not (eq (car a) 'float)) | |
146 (if (math-infinitep a) | |
147 a | |
148 (if (math-provably-integerp a) | |
149 a | |
150 (math-reject-arg a 'numberp)))) | |
151 ((integerp tol) | |
152 (if (<= tol 0) | |
153 (setq tol (+ tol calc-internal-prec))) | |
154 (calcFunc-frac a (list 'float 5 | |
155 (- (+ (math-numdigs (nth 1 a)) | |
156 (nth 2 a)) | |
157 (1+ tol))))) | |
158 ((not (eq (car tol) 'float)) | |
159 (if (Math-realp tol) | |
160 (calcFunc-frac a (math-float tol)) | |
161 (math-reject-arg tol 'realp))) | |
162 ((Math-negp tol) | |
163 (calcFunc-frac a (math-neg tol))) | |
164 ((Math-zerop tol) | |
165 (calcFunc-frac a 0)) | |
166 ((not (math-lessp-float tol '(float 1 0))) | |
167 (math-trunc a)) | |
168 ((Math-zerop a) | |
169 0) | |
170 (t | |
171 (let ((cfrac (math-continued-fraction a tol)) | |
172 (calc-prefer-frac t)) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
173 (math-eval-continued-fraction cfrac))))) |
40785 | 174 |
175 (defun math-continued-fraction (a tol) | |
176 (let ((calc-internal-prec (+ calc-internal-prec 2))) | |
177 (let ((cfrac nil) | |
178 (aa a) | |
179 (calc-prefer-frac nil) | |
180 int) | |
181 (while (or (null cfrac) | |
182 (and (not (Math-zerop aa)) | |
183 (not (math-lessp-float | |
184 (math-abs | |
185 (math-sub a | |
186 (let ((f (math-eval-continued-fraction | |
187 cfrac))) | |
188 (math-working "Fractionalize" f) | |
189 f))) | |
190 tol)))) | |
191 (setq int (math-trunc aa) | |
192 aa (math-sub aa int) | |
193 cfrac (cons int cfrac)) | |
194 (or (Math-zerop aa) | |
195 (setq aa (math-div 1 aa)))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
196 cfrac))) |
40785 | 197 |
198 (defun math-eval-continued-fraction (cf) | |
199 (let ((n (car cf)) | |
200 (d 1) | |
201 temp) | |
202 (while (setq cf (cdr cf)) | |
203 (setq temp (math-add (math-mul (car cf) n) d) | |
204 d n | |
205 n temp)) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
206 (math-div n d))) |
40785 | 207 |
208 (defun calcFunc-fdiv (a b) ; [R I I] [Public] | |
107791
439c9c198a6b
(calcFunc-fdiv): Allow `fdiv' to divide fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
209 (cond |
439c9c198a6b
(calcFunc-fdiv): Allow `fdiv' to divide fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
210 ((Math-num-integerp a) |
439c9c198a6b
(calcFunc-fdiv): Allow `fdiv' to divide fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
211 (cond |
439c9c198a6b
(calcFunc-fdiv): Allow `fdiv' to divide fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
212 ((Math-num-integerp b) |
439c9c198a6b
(calcFunc-fdiv): Allow `fdiv' to divide fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
213 (if (Math-zerop b) |
439c9c198a6b
(calcFunc-fdiv): Allow `fdiv' to divide fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
214 (math-reject-arg a "*Division by zero") |
439c9c198a6b
(calcFunc-fdiv): Allow `fdiv' to divide fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
215 (math-make-frac (math-trunc a) (math-trunc b)))) |
439c9c198a6b
(calcFunc-fdiv): Allow `fdiv' to divide fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
216 ((eq (car-safe b) 'frac) |
107792
84df551e8c64
(calcFunc-fdiv): Use `nth' to choose elements from list.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
107791
diff
changeset
|
217 (if (Math-zerop (nth 1 b)) |
107791
439c9c198a6b
(calcFunc-fdiv): Allow `fdiv' to divide fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
218 (math-reject-arg a "*Division by zero") |
107792
84df551e8c64
(calcFunc-fdiv): Use `nth' to choose elements from list.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
107791
diff
changeset
|
219 (math-make-frac (math-mul (math-trunc a) (nth 2 b)) (nth 1 b)))) |
107791
439c9c198a6b
(calcFunc-fdiv): Allow `fdiv' to divide fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
220 (t (math-reject-arg b 'integerp)))) |
439c9c198a6b
(calcFunc-fdiv): Allow `fdiv' to divide fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
221 ((eq (car-safe a) 'frac) |
439c9c198a6b
(calcFunc-fdiv): Allow `fdiv' to divide fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
222 (cond |
439c9c198a6b
(calcFunc-fdiv): Allow `fdiv' to divide fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
223 ((Math-num-integerp b) |
439c9c198a6b
(calcFunc-fdiv): Allow `fdiv' to divide fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
224 (if (Math-zerop b) |
439c9c198a6b
(calcFunc-fdiv): Allow `fdiv' to divide fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
225 (math-reject-arg a "*Division by zero") |
107792
84df551e8c64
(calcFunc-fdiv): Use `nth' to choose elements from list.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
107791
diff
changeset
|
226 (math-make-frac (cadr a) (math-mul (nth 2 a) (math-trunc b))))) |
107791
439c9c198a6b
(calcFunc-fdiv): Allow `fdiv' to divide fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
227 ((eq (car-safe b) 'frac) |
107792
84df551e8c64
(calcFunc-fdiv): Use `nth' to choose elements from list.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
107791
diff
changeset
|
228 (if (Math-zerop (nth 1 b)) |
107791
439c9c198a6b
(calcFunc-fdiv): Allow `fdiv' to divide fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
229 (math-reject-arg a "*Division by zero") |
107792
84df551e8c64
(calcFunc-fdiv): Use `nth' to choose elements from list.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
107791
diff
changeset
|
230 (math-make-frac (math-mul (nth 1 a) (nth 2 b)) (math-mul (nth 2 a) (nth 1 b))))) |
107791
439c9c198a6b
(calcFunc-fdiv): Allow `fdiv' to divide fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
231 (t (math-reject-arg b 'integerp)))) |
439c9c198a6b
(calcFunc-fdiv): Allow `fdiv' to divide fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
232 (t |
439c9c198a6b
(calcFunc-fdiv): Allow `fdiv' to divide fractions.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
106815
diff
changeset
|
233 (math-reject-arg a 'integerp)))) |
40785 | 234 |
58655
4683e1bb5445
Add a provide statement.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57848
diff
changeset
|
235 (provide 'calc-frac) |
4683e1bb5445
Add a provide statement.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57848
diff
changeset
|
236 |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79702
diff
changeset
|
237 ;; arch-tag: 89d65274-0b3b-42d8-aacd-eaf86da5b4ea |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
238 ;;; calc-frac.el ends here |