2020-10-10 16:00:51 -04:00
|
|
|
;;; calc-frac.el --- fraction functions for Calc -*- lexical-binding:t -*-
|
2001-11-19 07:34:00 +00:00
|
|
|
|
2022-01-01 02:45:51 -05:00
|
|
|
;; Copyright (C) 1990-1993, 2001-2022 Free Software Foundation, Inc.
|
2001-11-06 18:59:06 +00:00
|
|
|
|
2001-11-19 07:34:00 +00:00
|
|
|
;; Author: David Gillespie <daveg@synaptics.com>
|
2001-11-06 18:59:06 +00:00
|
|
|
|
2001-11-23 06:05:11 +00:00
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 03:16:00 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2007-03-19 20:59:53 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:16:00 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
2007-03-19 20:59:53 +00:00
|
|
|
|
2001-11-06 18:59:06 +00:00
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
2007-03-19 20:59:53 +00:00
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 15:52:52 -07:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2001-11-06 18:59:06 +00:00
|
|
|
|
2001-11-19 07:34:00 +00:00
|
|
|
;;; Commentary:
|
2001-11-06 18:59:06 +00:00
|
|
|
|
2001-11-19 07:34:00 +00:00
|
|
|
;;; Code:
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
;; This file is autoloaded from calc-ext.el.
|
|
|
|
|
2004-11-30 17:09:05 +00:00
|
|
|
(require 'calc-ext)
|
2001-11-06 18:59:06 +00:00
|
|
|
(require 'calc-macs)
|
|
|
|
|
|
|
|
(defun calc-fdiv (arg)
|
|
|
|
(interactive "P")
|
|
|
|
(calc-slow-wrapper
|
2001-11-14 09:09:09 +00:00
|
|
|
(calc-binary-op ":" 'calcFunc-fdiv arg 1)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
(defun calc-fraction (arg)
|
|
|
|
(interactive "P")
|
|
|
|
(calc-slow-wrapper
|
|
|
|
(let ((func (if (calc-is-hyperbolic) 'calcFunc-frac 'calcFunc-pfrac)))
|
|
|
|
(if (eq arg 0)
|
|
|
|
(calc-enter-result 2 "frac" (list func
|
|
|
|
(calc-top-n 2)
|
|
|
|
(calc-top-n 1)))
|
|
|
|
(calc-enter-result 1 "frac" (list func
|
|
|
|
(calc-top-n 1)
|
2001-11-14 09:09:09 +00:00
|
|
|
(prefix-numeric-value (or arg 0))))))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
(defun calc-over-notation (fmt)
|
2004-11-01 20:08:56 +00:00
|
|
|
(interactive "sFraction separator: ")
|
2001-11-06 18:59:06 +00:00
|
|
|
(calc-wrapper
|
|
|
|
(if (string-match "\\`\\([^ 0-9][^ 0-9]?\\)[0-9]*\\'" fmt)
|
|
|
|
(let ((n nil))
|
|
|
|
(if (/= (match-end 0) (match-end 1))
|
2005-05-02 19:43:25 +00:00
|
|
|
(setq n (string-to-number (substring fmt (match-end 1)))
|
2001-11-06 18:59:06 +00:00
|
|
|
fmt (math-match-substring fmt 1)))
|
|
|
|
(if (eq n 0) (error "Bad denominator"))
|
|
|
|
(calc-change-mode 'calc-frac-format (list fmt n) t))
|
2001-11-19 07:34:00 +00:00
|
|
|
(error "Bad fraction separator format"))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
(defun calc-slash-notation (n)
|
|
|
|
(interactive "P")
|
|
|
|
(calc-wrapper
|
2001-11-14 09:09:09 +00:00
|
|
|
(calc-change-mode 'calc-frac-format (if n '("//" nil) '("/" nil)) t)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
(defun calc-frac-mode (n)
|
|
|
|
(interactive "P")
|
|
|
|
(calc-wrapper
|
|
|
|
(calc-change-mode 'calc-prefer-frac n nil t)
|
|
|
|
(message (if calc-prefer-frac
|
2001-11-19 07:34:00 +00:00
|
|
|
"Integer division will now generate fractions"
|
|
|
|
"Integer division will now generate floating-point results"))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
;;;; Fractions.
|
|
|
|
|
|
|
|
;;; Build a normalized fraction. [R I I]
|
|
|
|
;;; (This could probably be implemented more efficiently than using
|
|
|
|
;;; the plain gcd algorithm.)
|
|
|
|
(defun math-make-frac (num den)
|
|
|
|
(if (Math-integer-negp den)
|
|
|
|
(setq num (math-neg num)
|
|
|
|
den (math-neg den)))
|
|
|
|
(let ((gcd (math-gcd num den)))
|
|
|
|
(if (eq gcd 1)
|
|
|
|
(if (eq den 1)
|
|
|
|
num
|
|
|
|
(list 'frac num den))
|
|
|
|
(if (equal gcd den)
|
|
|
|
(math-quotient num gcd)
|
2001-11-14 09:09:09 +00:00
|
|
|
(list 'frac (math-quotient num gcd) (math-quotient den gcd))))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
(defun calc-add-fractions (a b)
|
|
|
|
(if (eq (car-safe a) 'frac)
|
|
|
|
(if (eq (car-safe b) 'frac)
|
|
|
|
(math-make-frac (math-add (math-mul (nth 1 a) (nth 2 b))
|
|
|
|
(math-mul (nth 2 a) (nth 1 b)))
|
|
|
|
(math-mul (nth 2 a) (nth 2 b)))
|
|
|
|
(math-make-frac (math-add (nth 1 a)
|
|
|
|
(math-mul (nth 2 a) b))
|
|
|
|
(nth 2 a)))
|
|
|
|
(math-make-frac (math-add (math-mul a (nth 2 b))
|
|
|
|
(nth 1 b))
|
2001-11-14 09:09:09 +00:00
|
|
|
(nth 2 b))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
(defun calc-mul-fractions (a b)
|
|
|
|
(if (eq (car-safe a) 'frac)
|
|
|
|
(if (eq (car-safe b) 'frac)
|
|
|
|
(math-make-frac (math-mul (nth 1 a) (nth 1 b))
|
|
|
|
(math-mul (nth 2 a) (nth 2 b)))
|
|
|
|
(math-make-frac (math-mul (nth 1 a) b)
|
|
|
|
(nth 2 a)))
|
|
|
|
(math-make-frac (math-mul a (nth 1 b))
|
2001-11-14 09:09:09 +00:00
|
|
|
(nth 2 b))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
(defun calc-div-fractions (a b)
|
|
|
|
(if (eq (car-safe a) 'frac)
|
|
|
|
(if (eq (car-safe b) 'frac)
|
|
|
|
(math-make-frac (math-mul (nth 1 a) (nth 2 b))
|
|
|
|
(math-mul (nth 2 a) (nth 1 b)))
|
|
|
|
(math-make-frac (nth 1 a)
|
|
|
|
(math-mul (nth 2 a) b)))
|
|
|
|
(math-make-frac (math-mul a (nth 2 b))
|
2001-11-14 09:09:09 +00:00
|
|
|
(nth 1 b))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
;;; Convert a real value to fractional form. [T R I; T R F] [Public]
|
|
|
|
(defun calcFunc-frac (a &optional tol)
|
|
|
|
(or tol (setq tol 0))
|
|
|
|
(cond ((Math-ratp a)
|
|
|
|
a)
|
|
|
|
((memq (car a) '(cplx polar vec hms date sdev intv mod))
|
Don't quote lambdas with 'function' in calc/*.el
* lisp/calc/calc-aent.el (calc-do-quick-calc)
(calc-do-calc-eval, math-build-parse-table):
* lisp/calc/calc-alg.el (math-polynomial-base):
* lisp/calc/calc-alg.el (math-is-poly-rec):
* lisp/calc/calc-arith.el (calcFunc-scf):
* lisp/calc/calc-arith.el (math-ceiling, math-round):
* lisp/calc/calc-arith.el (math-trunc-fancy, math-floor-fancy):
* lisp/calc/calc-ext.el (calc-init-extensions, calc-reset)
(calc-refresh-top, calc-z-prefix-help, calc-binary-op-fancy)
(calc-unary-op-fancy):
* lisp/calc/calc-forms.el (math-make-mod):
* lisp/calc/calc-frac.el (calcFunc-frac):
* lisp/calc/calc-funcs.el (calcFunc-euler):
* lisp/calc/calc-help.el (calc-full-help):
* lisp/calc/calc-lang.el (c, pascal, fortran, tex, latex, eqn)
(yacas, maxima, giac, math, maple):
* lisp/calc/calc-macs.el (calc-wrapper, calc-slow-wrapper):
* lisp/calc/calc-map.el (calc-get-operator, calcFunc-mapeqr)
(calcFunc-reducea, calcFunc-rreducea, calcFunc-reduced)
(calcFunc-rreduced, calcFunc-outer):
* lisp/calc/calc-misc.el (another-calc, calc-do-handle-whys):
* lisp/calc/calc-mode.el (calc-save-modes):
* lisp/calc/calc-mtx.el (math-col-matrix, math-mul-mat-vec):
* lisp/calc/calc-poly.el (math-sort-terms, math-poly-div-list)
(math-mul-list, math-sort-poly-base-list)
(math-partial-fractions):
* lisp/calc/calc-prog.el (calc-user-define-formula):
* lisp/calc/calc-rewr.el (math-rewrite, math-compile-patterns)
(math-compile-rewrites, math-parse-schedule)
(math-rwcomp-pattern):
* lisp/calc/calc-store.el (calc-var-name-map, calc-let)
(calc-permanent-variable, calc-insert-variables):
* lisp/calc/calc-stuff.el (calc-flush-caches, calcFunc-pclean)
(calcFunc-pfrac):
* lisp/calc/calc-units.el (math-build-units-table)
(math-decompose-units):
* lisp/calc/calc-vec.el (calcFunc-mrow, math-mat-col)
(calcFunc-mcol, math-mat-less-col, math-mimic-ident):
* lisp/calc/calc-yank.el (calc-edit):
* lisp/calc/calc.el
(calc-mode-var-list-restore-default-values)
(calc-mode-var-list-restore-saved-values, calc-mode, calc-quit):
* lisp/calc/calccomp.el (math-compose-expr)
(math-compose-matrix, math-vector-to-string): Don't quote lambdas with
'function'.
2020-11-17 02:51:30 +01:00
|
|
|
(cons (car a) (mapcar (lambda (x)
|
|
|
|
(calcFunc-frac x tol))
|
2001-11-06 18:59:06 +00:00
|
|
|
(cdr a))))
|
|
|
|
((Math-messy-integerp a)
|
|
|
|
(math-trunc a))
|
|
|
|
((Math-negp a)
|
|
|
|
(math-neg (calcFunc-frac (math-neg a) tol)))
|
|
|
|
((not (eq (car a) 'float))
|
|
|
|
(if (math-infinitep a)
|
|
|
|
a
|
|
|
|
(if (math-provably-integerp a)
|
|
|
|
a
|
|
|
|
(math-reject-arg a 'numberp))))
|
|
|
|
((integerp tol)
|
|
|
|
(if (<= tol 0)
|
|
|
|
(setq tol (+ tol calc-internal-prec)))
|
|
|
|
(calcFunc-frac a (list 'float 5
|
|
|
|
(- (+ (math-numdigs (nth 1 a))
|
|
|
|
(nth 2 a))
|
|
|
|
(1+ tol)))))
|
|
|
|
((not (eq (car tol) 'float))
|
|
|
|
(if (Math-realp tol)
|
|
|
|
(calcFunc-frac a (math-float tol))
|
|
|
|
(math-reject-arg tol 'realp)))
|
|
|
|
((Math-negp tol)
|
|
|
|
(calcFunc-frac a (math-neg tol)))
|
|
|
|
((Math-zerop tol)
|
|
|
|
(calcFunc-frac a 0))
|
|
|
|
((not (math-lessp-float tol '(float 1 0)))
|
|
|
|
(math-trunc a))
|
|
|
|
((Math-zerop a)
|
|
|
|
0)
|
|
|
|
(t
|
|
|
|
(let ((cfrac (math-continued-fraction a tol))
|
|
|
|
(calc-prefer-frac t))
|
2001-11-14 09:09:09 +00:00
|
|
|
(math-eval-continued-fraction cfrac)))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
(defun math-continued-fraction (a tol)
|
|
|
|
(let ((calc-internal-prec (+ calc-internal-prec 2)))
|
|
|
|
(let ((cfrac nil)
|
|
|
|
(aa a)
|
|
|
|
(calc-prefer-frac nil)
|
|
|
|
int)
|
|
|
|
(while (or (null cfrac)
|
|
|
|
(and (not (Math-zerop aa))
|
|
|
|
(not (math-lessp-float
|
|
|
|
(math-abs
|
|
|
|
(math-sub a
|
|
|
|
(let ((f (math-eval-continued-fraction
|
|
|
|
cfrac)))
|
|
|
|
(math-working "Fractionalize" f)
|
|
|
|
f)))
|
|
|
|
tol))))
|
|
|
|
(setq int (math-trunc aa)
|
|
|
|
aa (math-sub aa int)
|
|
|
|
cfrac (cons int cfrac))
|
|
|
|
(or (Math-zerop aa)
|
|
|
|
(setq aa (math-div 1 aa))))
|
2001-11-14 09:09:09 +00:00
|
|
|
cfrac)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
(defun math-eval-continued-fraction (cf)
|
|
|
|
(let ((n (car cf))
|
|
|
|
(d 1)
|
|
|
|
temp)
|
|
|
|
(while (setq cf (cdr cf))
|
|
|
|
(setq temp (math-add (math-mul (car cf) n) d)
|
|
|
|
d n
|
|
|
|
n temp))
|
2001-11-14 09:09:09 +00:00
|
|
|
(math-div n d)))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
|
|
|
(defun calcFunc-fdiv (a b) ; [R I I] [Public]
|
2010-04-06 20:33:00 -05:00
|
|
|
(cond
|
|
|
|
((Math-num-integerp a)
|
2017-09-13 15:52:52 -07:00
|
|
|
(cond
|
2010-04-06 20:33:00 -05:00
|
|
|
((Math-num-integerp b)
|
|
|
|
(if (Math-zerop b)
|
|
|
|
(math-reject-arg a "*Division by zero")
|
|
|
|
(math-make-frac (math-trunc a) (math-trunc b))))
|
|
|
|
((eq (car-safe b) 'frac)
|
2010-04-06 20:43:23 -05:00
|
|
|
(if (Math-zerop (nth 1 b))
|
2010-04-06 20:33:00 -05:00
|
|
|
(math-reject-arg a "*Division by zero")
|
2010-04-06 20:43:23 -05:00
|
|
|
(math-make-frac (math-mul (math-trunc a) (nth 2 b)) (nth 1 b))))
|
2010-04-06 20:33:00 -05:00
|
|
|
(t (math-reject-arg b 'integerp))))
|
|
|
|
((eq (car-safe a) 'frac)
|
2017-09-13 15:52:52 -07:00
|
|
|
(cond
|
2010-04-06 20:33:00 -05:00
|
|
|
((Math-num-integerp b)
|
|
|
|
(if (Math-zerop b)
|
|
|
|
(math-reject-arg a "*Division by zero")
|
2010-04-06 20:43:23 -05:00
|
|
|
(math-make-frac (cadr a) (math-mul (nth 2 a) (math-trunc b)))))
|
2010-04-06 20:33:00 -05:00
|
|
|
((eq (car-safe b) 'frac)
|
2010-04-06 20:43:23 -05:00
|
|
|
(if (Math-zerop (nth 1 b))
|
2010-04-06 20:33:00 -05:00
|
|
|
(math-reject-arg a "*Division by zero")
|
2010-04-06 20:43:23 -05:00
|
|
|
(math-make-frac (math-mul (nth 1 a) (nth 2 b)) (math-mul (nth 2 a) (nth 1 b)))))
|
2010-04-06 20:33:00 -05:00
|
|
|
(t (math-reject-arg b 'integerp))))
|
2017-09-13 15:52:52 -07:00
|
|
|
(t
|
2010-04-06 20:33:00 -05:00
|
|
|
(math-reject-arg a 'integerp))))
|
2001-11-06 18:59:06 +00:00
|
|
|
|
2004-11-30 17:09:05 +00:00
|
|
|
(provide 'calc-frac)
|
|
|
|
|
2001-11-14 09:09:09 +00:00
|
|
|
;;; calc-frac.el ends here
|