Mercurial > emacs
annotate lisp/calc/calc-vec.el @ 42811:cf0c0ef57504
*** empty log message ***
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Thu, 17 Jan 2002 19:29:24 +0000 |
| parents | fcd507927105 |
| children | f4d68f97221e |
| rev | line source |
|---|---|
|
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
1 ;;; calc-vec.el --- vector functions for Calc |
|
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
2 |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
3 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc. |
|
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
4 |
|
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
5 ;; Author: David Gillespie <daveg@synaptics.com> |
|
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
6 ;; Maintainer: Colin Walters <walters@debian.org> |
| 40785 | 7 |
| 8 ;; This file is part of GNU Emacs. | |
| 9 | |
| 10 ;; GNU Emacs is distributed in the hope that it will be useful, | |
| 11 ;; but WITHOUT ANY WARRANTY. No author or distributor | |
| 12 ;; accepts responsibility to anyone for the consequences of using it | |
| 13 ;; or for whether it serves any particular purpose or works at all, | |
| 14 ;; unless he says so in writing. Refer to the GNU Emacs General Public | |
| 15 ;; License for full details. | |
| 16 | |
| 17 ;; Everyone is granted permission to copy, modify and redistribute | |
| 18 ;; GNU Emacs, but only under the conditions described in the | |
| 19 ;; GNU Emacs General Public License. A copy of this license is | |
| 20 ;; supposed to have been given to you along with GNU Emacs so you | |
| 21 ;; can know your rights and responsibilities. It should be in a | |
| 22 ;; file named COPYING. Among other things, the copyright notice | |
| 23 ;; and this notice must be preserved on all copies. | |
| 24 | |
|
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
25 ;;; Commentary: |
| 40785 | 26 |
|
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
27 ;;; Code: |
| 40785 | 28 |
| 29 ;; This file is autoloaded from calc-ext.el. | |
| 30 (require 'calc-ext) | |
| 31 | |
| 32 (require 'calc-macs) | |
| 33 | |
| 34 (defun calc-Need-calc-vec () nil) | |
| 35 | |
| 36 | |
| 37 (defun calc-display-strings (n) | |
| 38 (interactive "P") | |
| 39 (calc-wrapper | |
| 40 (message (if (calc-change-mode 'calc-display-strings n t t) | |
|
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
41 "Displaying vectors of integers as quoted strings" |
|
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
42 "Displaying vectors of integers normally")))) |
| 40785 | 43 |
| 44 | |
| 45 (defun calc-pack (n) | |
| 46 (interactive "P") | |
| 47 (calc-wrapper | |
| 48 (let* ((nn (if n 1 2)) | |
| 49 (mode (if n (prefix-numeric-value n) (calc-top-n 1))) | |
| 50 (mode (if (and (Math-vectorp mode) (cdr mode)) (cdr mode) | |
| 51 (if (integerp mode) mode | |
| 52 (error "Packing mode must be an integer or vector of integers")))) | |
| 53 (num (calc-pack-size mode)) | |
| 54 (items (calc-top-list num nn))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
55 (calc-enter-result (+ nn num -1) "pack" (calc-pack-items mode items))))) |
| 40785 | 56 |
| 57 (defun calc-pack-size (mode) | |
| 58 (cond ((consp mode) | |
| 59 (let ((size 1)) | |
| 60 (while mode | |
| 61 (or (integerp (car mode)) (error "Vector of integers expected")) | |
| 62 (setq size (* size (calc-pack-size (car mode))) | |
| 63 mode (cdr mode))) | |
| 64 (if (= size 0) | |
| 65 (error "Zero dimensions not allowed") | |
| 66 size))) | |
| 67 ((>= mode 0) mode) | |
| 68 (t (or (cdr (assq mode '((-3 . 3) (-13 . 1) (-14 . 3) (-15 . 6)))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
69 2)))) |
| 40785 | 70 |
| 71 (defun calc-pack-items (mode items) | |
| 72 (cond ((consp mode) | |
| 73 (if (cdr mode) | |
| 74 (let* ((size (calc-pack-size (cdr mode))) | |
| 75 (len (length items)) | |
| 76 (new nil) | |
| 77 p row) | |
| 78 (while (> len 0) | |
| 79 (setq p (nthcdr (1- size) items) | |
| 80 row items | |
| 81 items (cdr p) | |
| 82 len (- len size)) | |
| 83 (setcdr p nil) | |
| 84 (setq new (cons (calc-pack-items (cdr mode) row) new))) | |
| 85 (calc-pack-items (car mode) (nreverse new))) | |
| 86 (calc-pack-items (car mode) items))) | |
| 87 ((>= mode 0) | |
| 88 (cons 'vec items)) | |
| 89 ((= mode -3) | |
| 90 (if (and (math-objvecp (car items)) | |
| 91 (math-objvecp (nth 1 items)) | |
| 92 (math-objvecp (nth 2 items))) | |
| 93 (if (and (math-num-integerp (car items)) | |
| 94 (math-num-integerp (nth 1 items))) | |
| 95 (if (math-realp (nth 2 items)) | |
| 96 (cons 'hms items) | |
| 97 (error "Seconds must be real")) | |
| 98 (error "Hours and minutes must be integers")) | |
| 99 (math-normalize (list '+ | |
| 100 (list '+ | |
| 101 (if (eq calc-angle-mode 'rad) | |
| 102 (list '* (car items) | |
| 103 '(hms 1 0 0)) | |
| 104 (car items)) | |
| 105 (list '* (nth 1 items) '(hms 0 1 0))) | |
| 106 (list '* (nth 2 items) '(hms 0 0 1)))))) | |
| 107 ((= mode -13) | |
| 108 (if (math-realp (car items)) | |
| 109 (cons 'date items) | |
| 110 (if (eq (car-safe (car items)) 'date) | |
| 111 (car items) | |
| 112 (if (math-objvecp (car items)) | |
| 113 (error "Date value must be real") | |
| 114 (cons 'calcFunc-date items))))) | |
| 115 ((memq mode '(-14 -15)) | |
| 116 (let ((p items)) | |
| 117 (while (and p (math-objvecp (car p))) | |
| 118 (or (math-integerp (car p)) | |
| 119 (error "Components must be integers")) | |
| 120 (setq p (cdr p))) | |
| 121 (if p | |
| 122 (cons 'calcFunc-date items) | |
| 123 (list 'date (math-dt-to-date items))))) | |
| 124 ((or (eq (car-safe (car items)) 'vec) | |
| 125 (eq (car-safe (nth 1 items)) 'vec)) | |
| 126 (let* ((x (car items)) | |
| 127 (vx (eq (car-safe x) 'vec)) | |
| 128 (y (nth 1 items)) | |
| 129 (vy (eq (car-safe y) 'vec)) | |
| 130 (z nil) | |
| 131 (n (1- (length (if vx x y))))) | |
| 132 (and vx vy | |
| 133 (/= n (1- (length y))) | |
| 134 (error "Vectors must be the same length")) | |
| 135 (while (>= (setq n (1- n)) 0) | |
| 136 (setq z (cons (calc-pack-items | |
| 137 mode | |
| 138 (list (if vx (car (setq x (cdr x))) x) | |
| 139 (if vy (car (setq y (cdr y))) y))) | |
| 140 z))) | |
| 141 (cons 'vec (nreverse z)))) | |
| 142 ((= mode -1) | |
| 143 (if (and (math-realp (car items)) (math-realp (nth 1 items))) | |
| 144 (cons 'cplx items) | |
| 145 (if (and (math-objectp (car items)) (math-objectp (nth 1 items))) | |
| 146 (error "Components must be real")) | |
| 147 (math-normalize (list '+ (car items) | |
| 148 (list '* (nth 1 items) '(cplx 0 1)))))) | |
| 149 ((= mode -2) | |
| 150 (if (and (math-realp (car items)) (math-anglep (nth 1 items))) | |
| 151 (cons 'polar items) | |
| 152 (if (and (math-objectp (car items)) (math-objectp (nth 1 items))) | |
| 153 (error "Components must be real")) | |
| 154 (math-normalize (list '* (car items) | |
| 155 (if (math-anglep (nth 1 items)) | |
| 156 (list 'polar 1 (nth 1 items)) | |
| 157 (list 'calcFunc-exp | |
| 158 (list '* | |
| 159 (math-to-radians-2 | |
| 160 (nth 1 items)) | |
| 161 (list 'polar | |
| 162 1 | |
| 163 (math-quarter-circle | |
| 164 nil))))))))) | |
| 165 ((= mode -4) | |
| 166 (let ((x (car items)) | |
| 167 (sigma (nth 1 items))) | |
| 168 (if (or (math-scalarp x) (not (math-objvecp x))) | |
| 169 (if (or (math-anglep sigma) (not (math-objvecp sigma))) | |
| 170 (math-make-sdev x sigma) | |
| 171 (error "Error component must be real")) | |
| 172 (error "Mean component must be real or complex")))) | |
| 173 ((= mode -5) | |
| 174 (let ((a (car items)) | |
| 175 (m (nth 1 items))) | |
| 176 (if (and (math-anglep a) (math-anglep m)) | |
| 177 (if (math-posp m) | |
| 178 (math-make-mod a m) | |
| 179 (error "Modulus must be positive")) | |
| 180 (if (and (math-objectp a) (math-objectp m)) | |
| 181 (error "Components must be real")) | |
| 182 (list 'calcFunc-makemod a m)))) | |
| 183 ((memq mode '(-6 -7 -8 -9)) | |
| 184 (let ((lo (car items)) | |
| 185 (hi (nth 1 items))) | |
| 186 (if (and (or (math-anglep lo) (eq (car lo) 'date) | |
| 187 (not (math-objvecp lo))) | |
| 188 (or (math-anglep hi) (eq (car hi) 'date) | |
| 189 (not (math-objvecp hi)))) | |
| 190 (math-make-intv (+ mode 9) lo hi) | |
| 191 (error "Components must be real")))) | |
| 192 ((eq mode -10) | |
| 193 (if (math-zerop (nth 1 items)) | |
| 194 (error "Denominator must not be zero") | |
| 195 (if (and (math-integerp (car items)) (math-integerp (nth 1 items))) | |
| 196 (math-normalize (cons 'frac items)) | |
| 197 (if (and (math-objectp (car items)) (math-objectp (nth 1 items))) | |
| 198 (error "Components must be integers")) | |
| 199 (cons 'calcFunc-fdiv items)))) | |
| 200 ((memq mode '(-11 -12)) | |
| 201 (if (and (math-realp (car items)) (math-integerp (nth 1 items))) | |
| 202 (calcFunc-scf (math-float (car items)) (nth 1 items)) | |
| 203 (if (and (math-objectp (car items)) (math-objectp (nth 1 items))) | |
| 204 (error "Components must be integers")) | |
| 205 (math-normalize | |
| 206 (list 'calcFunc-scf | |
| 207 (list 'calcFunc-float (car items)) | |
| 208 (nth 1 items))))) | |
| 209 (t | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
210 (error "Invalid packing mode: %d" mode)))) |
| 40785 | 211 |
|
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
212 (defvar calc-unpack-with-type nil) |
| 40785 | 213 (defun calc-unpack (mode) |
| 214 (interactive "P") | |
| 215 (calc-wrapper | |
| 216 (let ((calc-unpack-with-type t)) | |
| 217 (calc-pop-push-record-list 1 "unpk" (calc-unpack-item | |
| 218 (and mode | |
| 219 (prefix-numeric-value mode)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
220 (calc-top)))))) |
| 40785 | 221 |
| 222 (defun calc-unpack-type (item) | |
| 223 (cond ((eq (car-safe item) 'vec) | |
| 224 (1- (length item))) | |
| 225 ((eq (car-safe item) 'intv) | |
| 226 (- (nth 1 item) 9)) | |
| 227 (t | |
| 228 (or (cdr (assq (car-safe item) '( (cplx . -1) (polar . -2) | |
| 229 (hms . -3) (sdev . -4) (mod . -5) | |
| 230 (frac . -10) (float . -11) | |
| 231 (date . -13) ))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
232 (error "Argument must be a composite object"))))) |
| 40785 | 233 |
| 234 (defun calc-unpack-item (mode item) | |
| 235 (cond ((not mode) | |
| 236 (if (or (and (not (memq (car-safe item) '(frac float cplx polar vec | |
| 237 hms date sdev mod | |
| 238 intv))) | |
| 239 (math-objvecp item)) | |
| 240 (eq (car-safe item) 'var)) | |
| 241 (error "Argument must be a composite object or function call")) | |
| 242 (if (eq (car item) 'intv) | |
| 243 (cdr (cdr item)) | |
| 244 (cdr item))) | |
| 245 ((> mode 0) | |
| 246 (let ((dims nil) | |
| 247 type new row) | |
| 248 (setq item (list item)) | |
| 249 (while (> mode 0) | |
| 250 (setq type (calc-unpack-type (car item)) | |
| 251 dims (cons type dims) | |
| 252 new (calc-unpack-item nil (car item))) | |
| 253 (while (setq item (cdr item)) | |
| 254 (or (= (calc-unpack-type (car item)) type) | |
| 255 (error "Inconsistent types or dimensions in vector elements")) | |
| 256 (setq new (append new (calc-unpack-item nil (car item))))) | |
| 257 (setq item new | |
| 258 mode (1- mode))) | |
| 259 (if (cdr dims) (setq dims (list (cons 'vec (nreverse dims))))) | |
| 260 (cond ((eq calc-unpack-with-type 'pair) | |
| 261 (list (car dims) (cons 'vec item))) | |
| 262 (calc-unpack-with-type | |
| 263 (append item dims)) | |
| 264 (t item)))) | |
| 265 ((eq calc-unpack-with-type 'pair) | |
| 266 (let ((calc-unpack-with-type nil)) | |
| 267 (list mode (cons 'vec (calc-unpack-item mode item))))) | |
| 268 ((= mode -3) | |
| 269 (if (eq (car-safe item) 'hms) | |
| 270 (cdr item) | |
| 271 (error "Argument must be an HMS form"))) | |
| 272 ((= mode -13) | |
| 273 (if (eq (car-safe item) 'date) | |
| 274 (cdr item) | |
| 275 (error "Argument must be a date form"))) | |
| 276 ((= mode -14) | |
| 277 (if (eq (car-safe item) 'date) | |
| 278 (math-date-to-dt (math-floor (nth 1 item))) | |
| 279 (error "Argument must be a date form"))) | |
| 280 ((= mode -15) | |
| 281 (if (eq (car-safe item) 'date) | |
| 282 (append (math-date-to-dt (nth 1 item)) | |
| 283 (and (not (math-integerp (nth 1 item))) | |
| 284 (list 0 0 0))) | |
| 285 (error "Argument must be a date form"))) | |
| 286 ((eq (car-safe item) 'vec) | |
| 287 (let ((x nil) | |
| 288 (y nil) | |
| 289 res) | |
| 290 (while (setq item (cdr item)) | |
| 291 (setq res (calc-unpack-item mode (car item)) | |
| 292 x (cons (car res) x) | |
| 293 y (cons (nth 1 res) y))) | |
| 294 (list (cons 'vec (nreverse x)) | |
| 295 (cons 'vec (nreverse y))))) | |
| 296 ((= mode -1) | |
| 297 (if (eq (car-safe item) 'cplx) | |
| 298 (cdr item) | |
| 299 (if (eq (car-safe item) 'polar) | |
| 300 (cdr (math-complex item)) | |
| 301 (if (Math-realp item) | |
| 302 (list item 0) | |
| 303 (error "Argument must be a complex number"))))) | |
| 304 ((= mode -2) | |
| 305 (if (or (memq (car-safe item) '(cplx polar)) | |
| 306 (Math-realp item)) | |
| 307 (cdr (math-polar item)) | |
| 308 (error "Argument must be a complex number"))) | |
| 309 ((= mode -4) | |
| 310 (if (eq (car-safe item) 'sdev) | |
| 311 (cdr item) | |
| 312 (list item 0))) | |
| 313 ((= mode -5) | |
| 314 (if (eq (car-safe item) 'mod) | |
| 315 (cdr item) | |
| 316 (error "Argument must be a modulo form"))) | |
| 317 ((memq mode '(-6 -7 -8 -9)) | |
| 318 (if (eq (car-safe item) 'intv) | |
| 319 (cdr (cdr item)) | |
| 320 (list item item))) | |
| 321 ((= mode -10) | |
| 322 (if (eq (car-safe item) 'frac) | |
| 323 (cdr item) | |
| 324 (if (Math-integerp item) | |
| 325 (list item 1) | |
| 326 (error "Argument must be a rational number")))) | |
| 327 ((= mode -11) | |
| 328 (if (eq (car-safe item) 'float) | |
| 329 (list (nth 1 item) (math-normalize (nth 2 item))) | |
| 330 (error "Expected a floating-point number"))) | |
| 331 ((= mode -12) | |
| 332 (if (eq (car-safe item) 'float) | |
| 333 (list (calcFunc-mant item) (calcFunc-xpon item)) | |
| 334 (error "Expected a floating-point number"))) | |
| 335 (t | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
336 (error "Invalid unpacking mode: %d" mode)))) |
| 40785 | 337 |
| 338 (defun calc-diag (n) | |
| 339 (interactive "P") | |
| 340 (calc-wrapper | |
| 341 (calc-enter-result 1 "diag" (if n | |
| 342 (list 'calcFunc-diag (calc-top-n 1) | |
| 343 (prefix-numeric-value n)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
344 (list 'calcFunc-diag (calc-top-n 1)))))) |
| 40785 | 345 |
| 346 (defun calc-ident (n) | |
| 347 (interactive "NDimension of identity matrix = ") | |
| 348 (calc-wrapper | |
| 349 (calc-enter-result 0 "idn" (if (eq n 0) | |
| 350 '(calcFunc-idn 1) | |
| 351 (list 'calcFunc-idn 1 | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
352 (prefix-numeric-value n)))))) |
| 40785 | 353 |
| 354 (defun calc-index (n &optional stack) | |
| 355 (interactive "NSize of vector = \nP") | |
| 356 (calc-wrapper | |
| 357 (if (consp stack) | |
| 358 (calc-enter-result 3 "indx" (cons 'calcFunc-index (calc-top-list-n 3))) | |
| 359 (calc-enter-result 0 "indx" (list 'calcFunc-index | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
360 (prefix-numeric-value n)))))) |
| 40785 | 361 |
| 362 (defun calc-build-vector (n) | |
| 363 (interactive "NSize of vector = ") | |
| 364 (calc-wrapper | |
| 365 (calc-enter-result 1 "bldv" (list 'calcFunc-cvec | |
| 366 (calc-top-n 1) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
367 (prefix-numeric-value n))))) |
| 40785 | 368 |
| 369 (defun calc-cons (arg) | |
| 370 (interactive "P") | |
| 371 (calc-wrapper | |
| 372 (if (calc-is-hyperbolic) | |
| 373 (calc-binary-op "rcns" 'calcFunc-rcons arg) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
374 (calc-binary-op "cons" 'calcFunc-cons arg)))) |
| 40785 | 375 |
| 376 | |
| 377 (defun calc-head (arg) | |
| 378 (interactive "P") | |
| 379 (calc-wrapper | |
| 380 (if (calc-is-inverse) | |
| 381 (if (calc-is-hyperbolic) | |
| 382 (calc-unary-op "rtai" 'calcFunc-rtail arg) | |
| 383 (calc-unary-op "tail" 'calcFunc-tail arg)) | |
| 384 (if (calc-is-hyperbolic) | |
| 385 (calc-unary-op "rhed" 'calcFunc-rhead arg) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
386 (calc-unary-op "head" 'calcFunc-head arg))))) |
| 40785 | 387 |
| 388 (defun calc-tail (arg) | |
| 389 (interactive "P") | |
| 390 (calc-invert-func) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
391 (calc-head arg)) |
| 40785 | 392 |
| 393 (defun calc-vlength (arg) | |
| 394 (interactive "P") | |
| 395 (calc-wrapper | |
| 396 (if (calc-is-hyperbolic) | |
| 397 (calc-unary-op "dims" 'calcFunc-mdims arg) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
398 (calc-unary-op "len" 'calcFunc-vlen arg)))) |
| 40785 | 399 |
| 400 (defun calc-arrange-vector (n) | |
| 401 (interactive "NNumber of columns = ") | |
| 402 (calc-wrapper | |
| 403 (calc-enter-result 1 "arng" (list 'calcFunc-arrange (calc-top-n 1) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
404 (prefix-numeric-value n))))) |
| 40785 | 405 |
| 406 (defun calc-vector-find (arg) | |
| 407 (interactive "P") | |
| 408 (calc-wrapper | |
| 409 (let ((func (cons 'calcFunc-find (calc-top-list-n 2)))) | |
| 410 (calc-enter-result | |
| 411 2 "find" | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
412 (if arg (append func (list (prefix-numeric-value arg))) func))))) |
| 40785 | 413 |
| 414 (defun calc-subvector () | |
| 415 (interactive) | |
| 416 (calc-wrapper | |
| 417 (if (calc-is-inverse) | |
| 418 (calc-enter-result 3 "rsvc" (cons 'calcFunc-rsubvec | |
| 419 (calc-top-list-n 3))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
420 (calc-enter-result 3 "svec" (cons 'calcFunc-subvec (calc-top-list-n 3)))))) |
| 40785 | 421 |
| 422 (defun calc-reverse-vector (arg) | |
| 423 (interactive "P") | |
| 424 (calc-wrapper | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
425 (calc-unary-op "rev" 'calcFunc-rev arg))) |
| 40785 | 426 |
| 427 (defun calc-mask-vector (arg) | |
| 428 (interactive "P") | |
| 429 (calc-wrapper | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
430 (calc-binary-op "vmsk" 'calcFunc-vmask arg))) |
| 40785 | 431 |
| 432 (defun calc-expand-vector (arg) | |
| 433 (interactive "P") | |
| 434 (calc-wrapper | |
| 435 (if (calc-is-hyperbolic) | |
| 436 (calc-enter-result 3 "vexp" (cons 'calcFunc-vexp (calc-top-list-n 3))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
437 (calc-binary-op "vexp" 'calcFunc-vexp arg)))) |
| 40785 | 438 |
| 439 (defun calc-sort () | |
| 440 (interactive) | |
| 441 (calc-slow-wrapper | |
| 442 (if (calc-is-inverse) | |
| 443 (calc-enter-result 1 "rsrt" (list 'calcFunc-rsort (calc-top-n 1))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
444 (calc-enter-result 1 "sort" (list 'calcFunc-sort (calc-top-n 1)))))) |
| 40785 | 445 |
| 446 (defun calc-grade () | |
| 447 (interactive) | |
| 448 (calc-slow-wrapper | |
| 449 (if (calc-is-inverse) | |
| 450 (calc-enter-result 1 "rgrd" (list 'calcFunc-rgrade (calc-top-n 1))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
451 (calc-enter-result 1 "grad" (list 'calcFunc-grade (calc-top-n 1)))))) |
| 40785 | 452 |
| 453 (defun calc-histogram (n) | |
| 454 (interactive "NNumber of bins: ") | |
| 455 (calc-slow-wrapper | |
| 456 (if calc-hyperbolic-flag | |
| 457 (calc-enter-result 2 "hist" (list 'calcFunc-histogram | |
| 458 (calc-top-n 2) | |
| 459 (calc-top-n 1) | |
| 460 (prefix-numeric-value n))) | |
| 461 (calc-enter-result 1 "hist" (list 'calcFunc-histogram | |
| 462 (calc-top-n 1) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
463 (prefix-numeric-value n)))))) |
| 40785 | 464 |
| 465 (defun calc-transpose (arg) | |
| 466 (interactive "P") | |
| 467 (calc-wrapper | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
468 (calc-unary-op "trn" 'calcFunc-trn arg))) |
| 40785 | 469 |
| 470 (defun calc-conj-transpose (arg) | |
| 471 (interactive "P") | |
| 472 (calc-wrapper | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
473 (calc-unary-op "ctrn" 'calcFunc-ctrn arg))) |
| 40785 | 474 |
| 475 (defun calc-cross (arg) | |
| 476 (interactive "P") | |
| 477 (calc-wrapper | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
478 (calc-binary-op "cros" 'calcFunc-cross arg))) |
| 40785 | 479 |
| 480 (defun calc-remove-duplicates (arg) | |
| 481 (interactive "P") | |
| 482 (calc-wrapper | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
483 (calc-unary-op "rdup" 'calcFunc-rdup arg))) |
| 40785 | 484 |
| 485 (defun calc-set-union (arg) | |
| 486 (interactive "P") | |
| 487 (calc-wrapper | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
488 (calc-binary-op "unio" 'calcFunc-vunion arg '(vec) 'calcFunc-rdup))) |
| 40785 | 489 |
| 490 (defun calc-set-intersect (arg) | |
| 491 (interactive "P") | |
| 492 (calc-wrapper | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
493 (calc-binary-op "intr" 'calcFunc-vint arg '(vec) 'calcFunc-rdup))) |
| 40785 | 494 |
| 495 (defun calc-set-difference (arg) | |
| 496 (interactive "P") | |
| 497 (calc-wrapper | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
498 (calc-binary-op "diff" 'calcFunc-vdiff arg '(vec) 'calcFunc-rdup))) |
| 40785 | 499 |
| 500 (defun calc-set-xor (arg) | |
| 501 (interactive "P") | |
| 502 (calc-wrapper | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
503 (calc-binary-op "xor" 'calcFunc-vxor arg '(vec) 'calcFunc-rdup))) |
| 40785 | 504 |
| 505 (defun calc-set-complement (arg) | |
| 506 (interactive "P") | |
| 507 (calc-wrapper | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
508 (calc-unary-op "cmpl" 'calcFunc-vcompl arg))) |
| 40785 | 509 |
| 510 (defun calc-set-floor (arg) | |
| 511 (interactive "P") | |
| 512 (calc-wrapper | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
513 (calc-unary-op "vflr" 'calcFunc-vfloor arg))) |
| 40785 | 514 |
| 515 (defun calc-set-enumerate (arg) | |
| 516 (interactive "P") | |
| 517 (calc-wrapper | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
518 (calc-unary-op "enum" 'calcFunc-venum arg))) |
| 40785 | 519 |
| 520 (defun calc-set-span (arg) | |
| 521 (interactive "P") | |
| 522 (calc-wrapper | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
523 (calc-unary-op "span" 'calcFunc-vspan arg))) |
| 40785 | 524 |
| 525 (defun calc-set-cardinality (arg) | |
| 526 (interactive "P") | |
| 527 (calc-wrapper | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
528 (calc-unary-op "card" 'calcFunc-vcard arg))) |
| 40785 | 529 |
| 530 (defun calc-unpack-bits (arg) | |
| 531 (interactive "P") | |
| 532 (calc-wrapper | |
| 533 (if (calc-is-inverse) | |
| 534 (calc-unary-op "bpck" 'calcFunc-vpack arg) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
535 (calc-unary-op "bupk" 'calcFunc-vunpack arg)))) |
| 40785 | 536 |
| 537 (defun calc-pack-bits (arg) | |
| 538 (interactive "P") | |
| 539 (calc-invert-func) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
540 (calc-unpack-bits arg)) |
| 40785 | 541 |
| 542 | |
| 543 (defun calc-rnorm (arg) | |
| 544 (interactive "P") | |
| 545 (calc-wrapper | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
546 (calc-unary-op "rnrm" 'calcFunc-rnorm arg))) |
| 40785 | 547 |
| 548 (defun calc-cnorm (arg) | |
| 549 (interactive "P") | |
| 550 (calc-wrapper | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
551 (calc-unary-op "cnrm" 'calcFunc-cnorm arg))) |
| 40785 | 552 |
| 553 (defun calc-mrow (n &optional nn) | |
| 554 (interactive "NRow number: \nP") | |
| 555 (calc-wrapper | |
| 556 (if (consp nn) | |
| 557 (calc-enter-result 2 "mrow" (cons 'calcFunc-mrow (calc-top-list-n 2))) | |
| 558 (setq n (prefix-numeric-value n)) | |
| 559 (if (= n 0) | |
| 560 (calc-enter-result 1 "getd" (list 'calcFunc-getdiag (calc-top-n 1))) | |
| 561 (if (< n 0) | |
| 562 (calc-enter-result 1 "rrow" (list 'calcFunc-mrrow | |
| 563 (calc-top-n 1) (- n))) | |
| 564 (calc-enter-result 1 "mrow" (list 'calcFunc-mrow | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
565 (calc-top-n 1) n))))))) |
| 40785 | 566 |
| 567 (defun calc-mcol (n &optional nn) | |
| 568 (interactive "NColumn number: \nP") | |
| 569 (calc-wrapper | |
| 570 (if (consp nn) | |
| 571 (calc-enter-result 2 "mcol" (cons 'calcFunc-mcol (calc-top-list-n 2))) | |
| 572 (setq n (prefix-numeric-value n)) | |
| 573 (if (= n 0) | |
| 574 (calc-enter-result 1 "getd" (list 'calcFunc-getdiag (calc-top-n 1))) | |
| 575 (if (< n 0) | |
| 576 (calc-enter-result 1 "rcol" (list 'calcFunc-mrcol | |
| 577 (calc-top-n 1) (- n))) | |
| 578 (calc-enter-result 1 "mcol" (list 'calcFunc-mcol | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
579 (calc-top-n 1) n))))))) |
| 40785 | 580 |
| 581 | |
| 582 ;;;; Vectors. | |
| 583 | |
| 584 (defun calcFunc-mdims (m) | |
| 585 (or (math-vectorp m) | |
| 586 (math-reject-arg m 'vectorp)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
587 (cons 'vec (math-mat-dimens m))) |
| 40785 | 588 |
| 589 | |
| 590 ;;; Apply a function elementwise to vector A. [V X V; N X N] [Public] | |
| 591 (defun math-map-vec (f a) | |
| 592 (if (math-vectorp a) | |
| 593 (cons 'vec (mapcar f (cdr a))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
594 (funcall f a))) |
| 40785 | 595 |
| 596 (defun math-dimension-error () | |
| 597 (calc-record-why "*Dimension error") | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
598 (signal 'wrong-type-argument nil)) |
| 40785 | 599 |
| 600 | |
| 601 ;;; Build a vector out of a list of objects. [Public] | |
| 602 (defun calcFunc-vec (&rest objs) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
603 (cons 'vec objs)) |
| 40785 | 604 |
| 605 | |
| 606 ;;; Build a constant vector or matrix. [Public] | |
| 607 (defun calcFunc-cvec (obj &rest dims) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
608 (math-make-vec-dimen obj dims)) |
| 40785 | 609 |
| 610 (defun math-make-vec-dimen (obj dims) | |
| 611 (if dims | |
| 612 (if (natnump (car dims)) | |
| 613 (if (or (cdr dims) | |
| 614 (not (math-numberp obj))) | |
| 615 (cons 'vec (copy-sequence | |
| 616 (make-list (car dims) | |
| 617 (math-make-vec-dimen obj (cdr dims))))) | |
| 618 (cons 'vec (make-list (car dims) obj))) | |
| 619 (math-reject-arg (car dims) 'fixnatnump)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
620 obj)) |
| 40785 | 621 |
| 622 (defun calcFunc-head (vec) | |
| 623 (if (and (Math-vectorp vec) | |
| 624 (cdr vec)) | |
| 625 (nth 1 vec) | |
| 626 (calc-record-why 'vectorp vec) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
627 (list 'calcFunc-head vec))) |
| 40785 | 628 |
| 629 (defun calcFunc-tail (vec) | |
| 630 (if (and (Math-vectorp vec) | |
| 631 (cdr vec)) | |
| 632 (cons 'vec (cdr (cdr vec))) | |
| 633 (calc-record-why 'vectorp vec) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
634 (list 'calcFunc-tail vec))) |
| 40785 | 635 |
| 636 (defun calcFunc-cons (head tail) | |
| 637 (if (Math-vectorp tail) | |
| 638 (cons 'vec (cons head (cdr tail))) | |
| 639 (calc-record-why 'vectorp tail) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
640 (list 'calcFunc-cons head tail))) |
| 40785 | 641 |
| 642 (defun calcFunc-rhead (vec) | |
| 643 (if (and (Math-vectorp vec) | |
| 644 (cdr vec)) | |
| 645 (let ((vec (copy-sequence vec))) | |
| 646 (setcdr (nthcdr (- (length vec) 2) vec) nil) | |
| 647 vec) | |
| 648 (calc-record-why 'vectorp vec) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
649 (list 'calcFunc-rhead vec))) |
| 40785 | 650 |
| 651 (defun calcFunc-rtail (vec) | |
| 652 (if (and (Math-vectorp vec) | |
| 653 (cdr vec)) | |
| 654 (nth (1- (length vec)) vec) | |
| 655 (calc-record-why 'vectorp vec) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
656 (list 'calcFunc-rtail vec))) |
| 40785 | 657 |
| 658 (defun calcFunc-rcons (head tail) | |
| 659 (if (Math-vectorp head) | |
| 660 (append head (list tail)) | |
| 661 (calc-record-why 'vectorp head) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
662 (list 'calcFunc-rcons head tail))) |
| 40785 | 663 |
| 664 | |
| 665 | |
| 666 ;;; Apply a function elementwise to vectors A and B. [O X O O] [Public] | |
| 667 (defun math-map-vec-2 (f a b) | |
| 668 (if (math-vectorp a) | |
| 669 (if (math-vectorp b) | |
| 670 (let ((v nil)) | |
| 671 (while (setq a (cdr a)) | |
| 672 (or (setq b (cdr b)) | |
| 673 (math-dimension-error)) | |
| 674 (setq v (cons (funcall f (car a) (car b)) v))) | |
| 675 (if a (math-dimension-error)) | |
| 676 (cons 'vec (nreverse v))) | |
| 677 (let ((v nil)) | |
| 678 (while (setq a (cdr a)) | |
| 679 (setq v (cons (funcall f (car a) b) v))) | |
| 680 (cons 'vec (nreverse v)))) | |
| 681 (if (math-vectorp b) | |
| 682 (let ((v nil)) | |
| 683 (while (setq b (cdr b)) | |
| 684 (setq v (cons (funcall f a (car b)) v))) | |
| 685 (cons 'vec (nreverse v))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
686 (funcall f a b)))) |
| 40785 | 687 |
| 688 | |
| 689 | |
| 690 ;;; "Reduce" a function over a vector (left-associatively). [O X V] [Public] | |
| 691 (defun math-reduce-vec (f a) | |
| 692 (if (math-vectorp a) | |
| 693 (if (cdr a) | |
| 694 (let ((accum (car (setq a (cdr a))))) | |
| 695 (while (setq a (cdr a)) | |
| 696 (setq accum (funcall f accum (car a)))) | |
| 697 accum) | |
| 698 0) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
699 a)) |
| 40785 | 700 |
| 701 ;;; Reduce a function over the columns of matrix A. [V X V] [Public] | |
| 702 (defun math-reduce-cols (f a) | |
| 703 (if (math-matrixp a) | |
| 704 (cons 'vec (math-reduce-cols-col-step f (cdr a) 1 (length (nth 1 a)))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
705 a)) |
| 40785 | 706 |
| 707 (defun math-reduce-cols-col-step (f a col cols) | |
| 708 (and (< col cols) | |
| 709 (cons (math-reduce-cols-row-step f (nth col (car a)) col (cdr a)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
710 (math-reduce-cols-col-step f a (1+ col) cols)))) |
| 40785 | 711 |
| 712 (defun math-reduce-cols-row-step (f tot col a) | |
| 713 (if a | |
| 714 (math-reduce-cols-row-step f | |
| 715 (funcall f tot (nth col (car a))) | |
| 716 col | |
| 717 (cdr a)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
718 tot)) |
| 40785 | 719 |
| 720 | |
| 721 | |
| 722 (defun math-dot-product (a b) | |
| 723 (if (setq a (cdr a) b (cdr b)) | |
| 724 (let ((accum (math-mul (car a) (car b)))) | |
| 725 (while (setq a (cdr a) b (cdr b)) | |
| 726 (setq accum (math-add accum (math-mul (car a) (car b))))) | |
| 727 accum) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
728 0)) |
| 40785 | 729 |
| 730 | |
| 731 ;;; Return the number of elements in vector V. [Public] | |
| 732 (defun calcFunc-vlen (v) | |
| 733 (if (math-vectorp v) | |
| 734 (1- (length v)) | |
| 735 (if (math-objectp v) | |
| 736 0 | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
737 (list 'calcFunc-vlen v)))) |
| 40785 | 738 |
| 739 ;;; Get the Nth row of a matrix. | |
| 740 (defun calcFunc-mrow (mat n) ; [Public] | |
| 741 (if (Math-vectorp n) | |
| 742 (math-map-vec (function (lambda (x) (calcFunc-mrow mat x))) n) | |
| 743 (if (and (eq (car-safe n) 'intv) (math-constp n)) | |
| 744 (calcFunc-subvec mat | |
| 745 (math-add (nth 2 n) (if (memq (nth 1 n) '(2 3)) 0 1)) | |
| 746 (math-add (nth 3 n) (if (memq (nth 1 n) '(1 3)) 1 0))) | |
| 747 (or (and (integerp (setq n (math-check-integer n))) | |
| 748 (> n 0)) | |
| 749 (math-reject-arg n 'fixposintp)) | |
| 750 (or (Math-vectorp mat) | |
| 751 (math-reject-arg mat 'vectorp)) | |
| 752 (or (nth n mat) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
753 (math-reject-arg n "*Index out of range"))))) |
| 40785 | 754 |
| 755 (defun calcFunc-subscr (mat n &optional m) | |
| 756 (setq mat (calcFunc-mrow mat n)) | |
| 757 (if m | |
| 758 (if (math-num-integerp n) | |
| 759 (calcFunc-mrow mat m) | |
| 760 (calcFunc-mcol mat m)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
761 mat)) |
| 40785 | 762 |
| 763 ;;; Get the Nth column of a matrix. | |
| 764 (defun math-mat-col (mat n) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
765 (cons 'vec (mapcar (function (lambda (x) (elt x n))) (cdr mat)))) |
| 40785 | 766 |
| 767 (defun calcFunc-mcol (mat n) ; [Public] | |
| 768 (if (Math-vectorp n) | |
| 769 (calcFunc-trn | |
| 770 (math-map-vec (function (lambda (x) (calcFunc-mcol mat x))) n)) | |
| 771 (if (and (eq (car-safe n) 'intv) (math-constp n)) | |
| 772 (if (math-matrixp mat) | |
| 773 (math-map-vec (function (lambda (x) (calcFunc-mrow x n))) mat) | |
| 774 (calcFunc-mrow mat n)) | |
| 775 (or (and (integerp (setq n (math-check-integer n))) | |
| 776 (> n 0)) | |
| 777 (math-reject-arg n 'fixposintp)) | |
| 778 (or (Math-vectorp mat) | |
| 779 (math-reject-arg mat 'vectorp)) | |
| 780 (or (if (math-matrixp mat) | |
| 781 (and (< n (length (nth 1 mat))) | |
| 782 (math-mat-col mat n)) | |
| 783 (nth n mat)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
784 (math-reject-arg n "*Index out of range"))))) |
| 40785 | 785 |
| 786 ;;; Remove the Nth row from a matrix. | |
| 787 (defun math-mat-less-row (mat n) | |
| 788 (if (<= n 0) | |
| 789 (cdr mat) | |
| 790 (cons (car mat) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
791 (math-mat-less-row (cdr mat) (1- n))))) |
| 40785 | 792 |
| 793 (defun calcFunc-mrrow (mat n) ; [Public] | |
| 794 (and (integerp (setq n (math-check-integer n))) | |
| 795 (> n 0) | |
| 796 (< n (length mat)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
797 (math-mat-less-row mat n))) |
| 40785 | 798 |
| 799 ;;; Remove the Nth column from a matrix. | |
| 800 (defun math-mat-less-col (mat n) | |
| 801 (cons 'vec (mapcar (function (lambda (x) (math-mat-less-row x n))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
802 (cdr mat)))) |
| 40785 | 803 |
| 804 (defun calcFunc-mrcol (mat n) ; [Public] | |
| 805 (and (integerp (setq n (math-check-integer n))) | |
| 806 (> n 0) | |
| 807 (if (math-matrixp mat) | |
| 808 (and (< n (length (nth 1 mat))) | |
| 809 (math-mat-less-col mat n)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
810 (math-mat-less-row mat n)))) |
| 40785 | 811 |
| 812 (defun calcFunc-getdiag (mat) ; [Public] | |
| 813 (if (math-square-matrixp mat) | |
| 814 (cons 'vec (math-get-diag-step (cdr mat) 1)) | |
| 815 (calc-record-why 'square-matrixp mat) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
816 (list 'calcFunc-getdiag mat))) |
| 40785 | 817 |
| 818 (defun math-get-diag-step (row n) | |
| 819 (and row | |
| 820 (cons (nth n (car row)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
821 (math-get-diag-step (cdr row) (1+ n))))) |
| 40785 | 822 |
| 823 (defun math-transpose (mat) ; [Public] | |
| 824 (let ((m nil) | |
| 825 (col (length (nth 1 mat)))) | |
| 826 (while (> (setq col (1- col)) 0) | |
| 827 (setq m (cons (math-mat-col mat col) m))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
828 (cons 'vec m))) |
| 40785 | 829 |
| 830 (defun calcFunc-trn (mat) | |
| 831 (if (math-vectorp mat) | |
| 832 (if (math-matrixp mat) | |
| 833 (math-transpose mat) | |
| 834 (math-col-matrix mat)) | |
| 835 (if (math-numberp mat) | |
| 836 mat | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
837 (math-reject-arg mat 'matrixp)))) |
| 40785 | 838 |
| 839 (defun calcFunc-ctrn (mat) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
840 (calcFunc-conj (calcFunc-trn mat))) |
| 40785 | 841 |
| 842 (defun calcFunc-pack (mode els) | |
| 843 (or (Math-vectorp els) (math-reject-arg els 'vectorp)) | |
| 844 (if (and (Math-vectorp mode) (cdr mode)) | |
| 845 (setq mode (cdr mode)) | |
| 846 (or (integerp mode) (math-reject-arg mode 'fixnump))) | |
| 847 (condition-case err | |
| 848 (if (= (calc-pack-size mode) (1- (length els))) | |
| 849 (calc-pack-items mode (cdr els)) | |
| 850 (math-reject-arg els "*Wrong number of elements")) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
851 (error (math-reject-arg els (nth 1 err))))) |
| 40785 | 852 |
| 853 (defun calcFunc-unpack (mode thing) | |
| 854 (or (integerp mode) (math-reject-arg mode 'fixnump)) | |
| 855 (condition-case err | |
| 856 (cons 'vec (calc-unpack-item mode thing)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
857 (error (math-reject-arg thing (nth 1 err))))) |
| 40785 | 858 |
| 859 (defun calcFunc-unpackt (mode thing) | |
| 860 (let ((calc-unpack-with-type 'pair)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
861 (calcFunc-unpack mode thing))) |
| 40785 | 862 |
| 863 (defun calcFunc-arrange (vec cols) ; [Public] | |
| 864 (setq cols (math-check-fixnum cols t)) | |
| 865 (if (math-vectorp vec) | |
| 866 (let* ((flat (math-flatten-vector vec)) | |
| 867 (mat (list 'vec)) | |
| 868 next) | |
| 869 (if (<= cols 0) | |
| 870 (nconc mat flat) | |
| 871 (while (>= (length flat) cols) | |
| 872 (setq next (nthcdr cols flat)) | |
| 873 (setcdr (nthcdr (1- cols) flat) nil) | |
| 874 (setq mat (nconc mat (list (cons 'vec flat))) | |
| 875 flat next)) | |
| 876 (if flat | |
| 877 (setq mat (nconc mat (list (cons 'vec flat))))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
878 mat)))) |
| 40785 | 879 |
| 880 (defun math-flatten-vector (vec) ; [L V] | |
| 881 (if (math-vectorp vec) | |
| 882 (apply 'append (mapcar 'math-flatten-vector (cdr vec))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
883 (list vec))) |
| 40785 | 884 |
| 885 (defun calcFunc-vconcat (a b) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
886 (math-normalize (list '| a b))) |
| 40785 | 887 |
| 888 (defun calcFunc-vconcatrev (a b) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
889 (math-normalize (list '| b a))) |
| 40785 | 890 |
| 891 (defun calcFunc-append (v1 v2) | |
| 892 (if (and (math-vectorp v1) (math-vectorp v2)) | |
| 893 (append v1 (cdr v2)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
894 (list 'calcFunc-append v1 v2))) |
| 40785 | 895 |
| 896 (defun calcFunc-appendrev (v1 v2) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
897 (calcFunc-append v2 v1)) |
| 40785 | 898 |
| 899 | |
| 900 ;;; Copy a matrix. [Public] | |
| 901 (defun math-copy-matrix (m) | |
| 902 (if (math-vectorp (nth 1 m)) | |
| 903 (cons 'vec (mapcar 'copy-sequence (cdr m))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
904 (copy-sequence m))) |
| 40785 | 905 |
| 906 ;;; Convert a scalar or vector into an NxN diagonal matrix. [Public] | |
| 907 (defun calcFunc-diag (a &optional n) | |
| 908 (and n (not (integerp n)) | |
| 909 (setq n (math-check-fixnum n))) | |
| 910 (if (math-vectorp a) | |
| 911 (if (and n (/= (length a) (1+ n))) | |
| 912 (list 'calcFunc-diag a n) | |
| 913 (if (math-matrixp a) | |
| 914 (if (and n (/= (length (elt a 1)) (1+ n))) | |
| 915 (list 'calcFunc-diag a n) | |
| 916 a) | |
| 917 (cons 'vec (math-diag-step (cdr a) 0 (1- (length a)))))) | |
| 918 (if n | |
| 919 (cons 'vec (math-diag-step (make-list n a) 0 n)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
920 (list 'calcFunc-diag a)))) |
| 40785 | 921 |
| 922 (defun calcFunc-idn (a &optional n) | |
| 923 (if n | |
| 924 (if (math-vectorp a) | |
| 925 (math-reject-arg a 'numberp) | |
| 926 (calcFunc-diag a n)) | |
| 927 (if (integerp calc-matrix-mode) | |
| 928 (calcFunc-idn a calc-matrix-mode) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
929 (list 'calcFunc-idn a)))) |
| 40785 | 930 |
| 931 (defun math-mimic-ident (a m) | |
| 932 (if (math-square-matrixp m) | |
| 933 (calcFunc-idn a (1- (length m))) | |
| 934 (if (math-vectorp m) | |
| 935 (if (math-zerop a) | |
| 936 (cons 'vec (mapcar (function (lambda (x) | |
| 937 (if (math-vectorp x) | |
| 938 (math-mimic-ident a x) | |
| 939 a))) | |
| 940 (cdr m))) | |
| 941 (math-dimension-error)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
942 (calcFunc-idn a)))) |
| 40785 | 943 |
| 944 (defun math-diag-step (a n m) | |
| 945 (if (< n m) | |
| 946 (cons (cons 'vec | |
| 947 (nconc (make-list n 0) | |
| 948 (cons (car a) | |
| 949 (make-list (1- (- m n)) 0)))) | |
| 950 (math-diag-step (cdr a) (1+ n) m)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
951 nil)) |
| 40785 | 952 |
| 953 ;;; Create a vector of consecutive integers. [Public] | |
| 954 (defun calcFunc-index (n &optional start incr) | |
| 955 (if (math-messy-integerp n) | |
| 956 (math-float (calcFunc-index (math-trunc n) start incr)) | |
| 957 (and (not (integerp n)) | |
| 958 (setq n (math-check-fixnum n))) | |
| 959 (let ((vec nil)) | |
| 960 (if start | |
| 961 (progn | |
| 962 (if (>= n 0) | |
| 963 (while (>= (setq n (1- n)) 0) | |
| 964 (setq vec (cons start vec) | |
| 965 start (math-add start (or incr 1)))) | |
| 966 (while (<= (setq n (1+ n)) 0) | |
| 967 (setq vec (cons start vec) | |
| 968 start (math-mul start (or incr 2))))) | |
| 969 (setq vec (nreverse vec))) | |
| 970 (if (>= n 0) | |
| 971 (while (> n 0) | |
| 972 (setq vec (cons n vec) | |
| 973 n (1- n))) | |
| 974 (let ((i -1)) | |
| 975 (while (>= i n) | |
| 976 (setq vec (cons i vec) | |
| 977 i (1- i)))))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
978 (cons 'vec vec)))) |
| 40785 | 979 |
| 980 ;;; Find an element in a vector. | |
| 981 (defun calcFunc-find (vec x &optional start) | |
| 982 (setq start (if start (math-check-fixnum start t) 1)) | |
| 983 (if (< start 1) (math-reject-arg start 'posp)) | |
| 984 (setq vec (nthcdr start vec)) | |
| 985 (let ((n start)) | |
| 986 (while (and vec (not (Math-equal x (car vec)))) | |
| 987 (setq n (1+ n) | |
| 988 vec (cdr vec))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
989 (if vec n 0))) |
| 40785 | 990 |
| 991 ;;; Return a subvector of a vector. | |
| 992 (defun calcFunc-subvec (vec start &optional end) | |
| 993 (setq start (math-check-fixnum start t) | |
| 994 end (math-check-fixnum (or end 0) t)) | |
| 995 (or (math-vectorp vec) (math-reject-arg vec 'vectorp)) | |
| 996 (let ((len (1- (length vec)))) | |
| 997 (if (<= start 0) | |
| 998 (setq start (+ len start 1))) | |
| 999 (if (<= end 0) | |
| 1000 (setq end (+ len end 1))) | |
| 1001 (if (or (> start len) | |
| 1002 (<= end start)) | |
| 1003 '(vec) | |
| 1004 (setq vec (nthcdr start vec)) | |
| 1005 (if (<= end len) | |
| 1006 (let ((chop (nthcdr (- end start 1) (setq vec (copy-sequence vec))))) | |
| 1007 (setcdr chop nil))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1008 (cons 'vec vec)))) |
| 40785 | 1009 |
| 1010 ;;; Remove a subvector from a vector. | |
| 1011 (defun calcFunc-rsubvec (vec start &optional end) | |
| 1012 (setq start (math-check-fixnum start t) | |
| 1013 end (math-check-fixnum (or end 0) t)) | |
| 1014 (or (math-vectorp vec) (math-reject-arg vec 'vectorp)) | |
| 1015 (let ((len (1- (length vec)))) | |
| 1016 (if (<= start 0) | |
| 1017 (setq start (+ len start 1))) | |
| 1018 (if (<= end 0) | |
| 1019 (setq end (+ len end 1))) | |
| 1020 (if (or (> start len) | |
| 1021 (<= end start)) | |
| 1022 vec | |
| 1023 (let ((tail (nthcdr end vec)) | |
| 1024 (chop (nthcdr (1- start) (setq vec (copy-sequence vec))))) | |
| 1025 (setcdr chop nil) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1026 (append vec tail))))) |
| 40785 | 1027 |
| 1028 ;;; Reverse the order of the elements of a vector. | |
| 1029 (defun calcFunc-rev (vec) | |
| 1030 (if (math-vectorp vec) | |
| 1031 (cons 'vec (reverse (cdr vec))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1032 (math-reject-arg vec 'vectorp))) |
| 40785 | 1033 |
| 1034 ;;; Compress a vector according to a mask vector. | |
| 1035 (defun calcFunc-vmask (mask vec) | |
| 1036 (if (math-numberp mask) | |
| 1037 (if (math-zerop mask) | |
| 1038 '(vec) | |
| 1039 vec) | |
| 1040 (or (math-vectorp mask) (math-reject-arg mask 'vectorp)) | |
| 1041 (or (math-constp mask) (math-reject-arg mask 'constp)) | |
| 1042 (or (math-vectorp vec) (math-reject-arg vec 'vectorp)) | |
| 1043 (or (= (length mask) (length vec)) (math-dimension-error)) | |
| 1044 (let ((new nil)) | |
| 1045 (while (setq mask (cdr mask) vec (cdr vec)) | |
| 1046 (or (math-zerop (car mask)) | |
| 1047 (setq new (cons (car vec) new)))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1048 (cons 'vec (nreverse new))))) |
| 40785 | 1049 |
| 1050 ;;; Expand a vector according to a mask vector. | |
| 1051 (defun calcFunc-vexp (mask vec &optional filler) | |
| 1052 (or (math-vectorp mask) (math-reject-arg mask 'vectorp)) | |
| 1053 (or (math-constp mask) (math-reject-arg mask 'constp)) | |
| 1054 (or (math-vectorp vec) (math-reject-arg vec 'vectorp)) | |
| 1055 (let ((new nil) | |
| 1056 (fvec (and filler (math-vectorp filler)))) | |
| 1057 (while (setq mask (cdr mask)) | |
| 1058 (if (math-zerop (car mask)) | |
| 1059 (setq new (cons (or (if fvec | |
| 1060 (car (setq filler (cdr filler))) | |
| 1061 filler) | |
| 1062 (car mask)) new)) | |
| 1063 (setq vec (cdr vec) | |
| 1064 new (cons (or (car vec) (car mask)) new)))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1065 (cons 'vec (nreverse new)))) |
| 40785 | 1066 |
| 1067 | |
| 1068 ;;; Compute the row and column norms of a vector or matrix. [Public] | |
| 1069 (defun calcFunc-rnorm (a) | |
| 1070 (if (and (Math-vectorp a) | |
| 1071 (math-constp a)) | |
| 1072 (if (math-matrixp a) | |
| 1073 (math-reduce-vec 'math-max (math-map-vec 'calcFunc-cnorm a)) | |
| 1074 (math-reduce-vec 'math-max (math-map-vec 'math-abs a))) | |
| 1075 (calc-record-why 'vectorp a) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1076 (list 'calcFunc-rnorm a))) |
| 40785 | 1077 |
| 1078 (defun calcFunc-cnorm (a) | |
| 1079 (if (and (Math-vectorp a) | |
| 1080 (math-constp a)) | |
| 1081 (if (math-matrixp a) | |
| 1082 (math-reduce-vec 'math-max | |
| 1083 (math-reduce-cols 'math-add-abs a)) | |
| 1084 (math-reduce-vec 'math-add-abs a)) | |
| 1085 (calc-record-why 'vectorp a) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1086 (list 'calcFunc-cnorm a))) |
| 40785 | 1087 |
| 1088 (defun math-add-abs (a b) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1089 (math-add (math-abs a) (math-abs b))) |
| 40785 | 1090 |
| 1091 | |
| 1092 ;;; Sort the elements of a vector into increasing order. | |
| 1093 (defun calcFunc-sort (vec) ; [Public] | |
| 1094 (if (math-vectorp vec) | |
| 1095 (cons 'vec (sort (copy-sequence (cdr vec)) 'math-beforep)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1096 (math-reject-arg vec 'vectorp))) |
| 40785 | 1097 |
| 1098 (defun calcFunc-rsort (vec) ; [Public] | |
| 1099 (if (math-vectorp vec) | |
| 1100 (cons 'vec (nreverse (sort (copy-sequence (cdr vec)) 'math-beforep))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1101 (math-reject-arg vec 'vectorp))) |
| 40785 | 1102 |
| 1103 (defun calcFunc-grade (grade-vec) | |
| 1104 (if (math-vectorp grade-vec) | |
| 1105 (let* ((len (1- (length grade-vec)))) | |
| 1106 (cons 'vec (sort (cdr (calcFunc-index len)) 'math-grade-beforep))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1107 (math-reject-arg grade-vec 'vectorp))) |
| 40785 | 1108 |
| 1109 (defun calcFunc-rgrade (grade-vec) | |
| 1110 (if (math-vectorp grade-vec) | |
| 1111 (let* ((len (1- (length grade-vec)))) | |
| 1112 (cons 'vec (nreverse (sort (cdr (calcFunc-index len)) | |
| 1113 'math-grade-beforep)))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1114 (math-reject-arg grade-vec 'vectorp))) |
| 40785 | 1115 |
| 1116 (defun math-grade-beforep (i j) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1117 (math-beforep (nth i grade-vec) (nth j grade-vec))) |
| 40785 | 1118 |
| 1119 | |
| 1120 ;;; Compile a histogram of data from a vector. | |
| 1121 (defun calcFunc-histogram (vec wts &optional n) | |
| 1122 (or n (setq n wts wts 1)) | |
| 1123 (or (Math-vectorp vec) | |
| 1124 (math-reject-arg vec 'vectorp)) | |
| 1125 (if (Math-vectorp wts) | |
| 1126 (or (= (length vec) (length wts)) | |
| 1127 (math-dimension-error))) | |
| 1128 (or (natnump n) | |
| 1129 (math-reject-arg n 'fixnatnump)) | |
| 1130 (let ((res (make-vector n 0)) | |
| 1131 (vp vec) | |
| 1132 (wvec (Math-vectorp wts)) | |
| 1133 (wp wts) | |
| 1134 bin) | |
| 1135 (while (setq vp (cdr vp)) | |
| 1136 (setq bin (car vp)) | |
| 1137 (or (natnump bin) | |
| 1138 (setq bin (math-floor bin))) | |
| 1139 (and (natnump bin) | |
| 1140 (< bin n) | |
| 1141 (aset res bin (math-add (aref res bin) | |
| 1142 (if wvec (car (setq wp (cdr wp))) wts))))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1143 (cons 'vec (append res nil)))) |
| 40785 | 1144 |
| 1145 | |
| 1146 ;;; Set operations. | |
| 1147 | |
| 1148 (defun calcFunc-vunion (a b) | |
| 1149 (if (Math-objectp a) | |
| 1150 (setq a (list 'vec a)) | |
| 1151 (or (math-vectorp a) (math-reject-arg a 'vectorp))) | |
| 1152 (if (Math-objectp b) | |
| 1153 (setq b (list b)) | |
| 1154 (or (math-vectorp b) (math-reject-arg b 'vectorp)) | |
| 1155 (setq b (cdr b))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1156 (calcFunc-rdup (append a b))) |
| 40785 | 1157 |
| 1158 (defun calcFunc-vint (a b) | |
| 1159 (if (and (math-simple-set a) (math-simple-set b)) | |
| 1160 (progn | |
| 1161 (setq a (cdr (calcFunc-rdup a))) | |
| 1162 (setq b (cdr (calcFunc-rdup b))) | |
| 1163 (let ((vec (list 'vec))) | |
| 1164 (while (and a b) | |
| 1165 (if (math-beforep (car a) (car b)) | |
| 1166 (setq a (cdr a)) | |
| 1167 (if (Math-equal (car a) (car b)) | |
| 1168 (setq vec (cons (car a) vec) | |
| 1169 a (cdr a))) | |
| 1170 (setq b (cdr b)))) | |
| 1171 (nreverse vec))) | |
| 1172 (calcFunc-vcompl (calcFunc-vunion (calcFunc-vcompl a) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1173 (calcFunc-vcompl b))))) |
| 40785 | 1174 |
| 1175 (defun calcFunc-vdiff (a b) | |
| 1176 (if (and (math-simple-set a) (math-simple-set b)) | |
| 1177 (progn | |
| 1178 (setq a (cdr (calcFunc-rdup a))) | |
| 1179 (setq b (cdr (calcFunc-rdup b))) | |
| 1180 (let ((vec (list 'vec))) | |
| 1181 (while a | |
| 1182 (while (and b (math-beforep (car b) (car a))) | |
| 1183 (setq b (cdr b))) | |
| 1184 (if (and b (Math-equal (car a) (car b))) | |
| 1185 (setq a (cdr a) | |
| 1186 b (cdr b)) | |
| 1187 (setq vec (cons (car a) vec) | |
| 1188 a (cdr a)))) | |
| 1189 (nreverse vec))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1190 (calcFunc-vcompl (calcFunc-vunion (calcFunc-vcompl a) b)))) |
| 40785 | 1191 |
| 1192 (defun calcFunc-vxor (a b) | |
| 1193 (if (and (math-simple-set a) (math-simple-set b)) | |
| 1194 (progn | |
| 1195 (setq a (cdr (calcFunc-rdup a))) | |
| 1196 (setq b (cdr (calcFunc-rdup b))) | |
| 1197 (let ((vec (list 'vec))) | |
| 1198 (while (or a b) | |
| 1199 (if (and a | |
| 1200 (or (not b) | |
| 1201 (math-beforep (car a) (car b)))) | |
| 1202 (setq vec (cons (car a) vec) | |
| 1203 a (cdr a)) | |
| 1204 (if (and a (Math-equal (car a) (car b))) | |
| 1205 (setq a (cdr a)) | |
| 1206 (setq vec (cons (car b) vec))) | |
| 1207 (setq b (cdr b)))) | |
| 1208 (nreverse vec))) | |
| 1209 (let ((ca (calcFunc-vcompl a)) | |
| 1210 (cb (calcFunc-vcompl b))) | |
| 1211 (calcFunc-vunion (calcFunc-vcompl (calcFunc-vunion ca b)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1212 (calcFunc-vcompl (calcFunc-vunion a cb)))))) |
| 40785 | 1213 |
| 1214 (defun calcFunc-vcompl (a) | |
| 1215 (setq a (math-prepare-set a)) | |
| 1216 (let ((vec (list 'vec)) | |
| 1217 (prev '(neg (var inf var-inf))) | |
| 1218 (closed 2)) | |
| 1219 (while (setq a (cdr a)) | |
| 1220 (or (and (equal (nth 2 (car a)) '(neg (var inf var-inf))) | |
| 1221 (memq (nth 1 (car a)) '(2 3))) | |
| 1222 (setq vec (cons (list 'intv | |
| 1223 (+ closed | |
| 1224 (if (memq (nth 1 (car a)) '(0 1)) 1 0)) | |
| 1225 prev | |
| 1226 (nth 2 (car a))) | |
| 1227 vec))) | |
| 1228 (setq prev (nth 3 (car a)) | |
| 1229 closed (if (memq (nth 1 (car a)) '(0 2)) 2 0))) | |
| 1230 (or (and (equal prev '(var inf var-inf)) | |
| 1231 (= closed 0)) | |
| 1232 (setq vec (cons (list 'intv (+ closed 1) | |
| 1233 prev '(var inf var-inf)) | |
| 1234 vec))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1235 (math-clean-set (nreverse vec)))) |
| 40785 | 1236 |
| 1237 (defun calcFunc-vspan (a) | |
| 1238 (setq a (math-prepare-set a)) | |
| 1239 (if (cdr a) | |
| 1240 (let ((last (nth (1- (length a)) a))) | |
| 1241 (math-make-intv (+ (logand (nth 1 (nth 1 a)) 2) | |
| 1242 (logand (nth 1 last) 1)) | |
| 1243 (nth 2 (nth 1 a)) | |
| 1244 (nth 3 last))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1245 '(intv 2 0 0))) |
| 40785 | 1246 |
| 1247 (defun calcFunc-vfloor (a &optional always-vec) | |
| 1248 (setq a (math-prepare-set a)) | |
| 1249 (let ((vec (list 'vec)) (p a) (prev nil) b mask) | |
| 1250 (while (setq p (cdr p)) | |
| 1251 (setq mask (nth 1 (car p)) | |
| 1252 a (nth 2 (car p)) | |
| 1253 b (nth 3 (car p))) | |
| 1254 (and (memq mask '(0 1)) | |
| 1255 (not (math-infinitep a)) | |
| 1256 (setq mask (logior mask 2)) | |
| 1257 (math-num-integerp a) | |
| 1258 (setq a (math-add a 1))) | |
| 1259 (setq a (math-ceiling a)) | |
| 1260 (and (memq mask '(0 2)) | |
| 1261 (not (math-infinitep b)) | |
| 1262 (setq mask (logior mask 1)) | |
| 1263 (math-num-integerp b) | |
| 1264 (setq b (math-sub b 1))) | |
| 1265 (setq b (math-floor b)) | |
| 1266 (if (and prev (Math-equal (math-sub a 1) (nth 3 prev))) | |
| 1267 (setcar (nthcdr 3 prev) b) | |
| 1268 (or (Math-lessp b a) | |
| 1269 (setq vec (cons (setq prev (list 'intv mask a b)) vec))))) | |
| 1270 (setq vec (nreverse vec)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1271 (math-clean-set vec always-vec))) |
| 40785 | 1272 |
| 1273 (defun calcFunc-vcard (a) | |
| 1274 (setq a (calcFunc-vfloor a t)) | |
| 1275 (or (math-constp a) (math-reject-arg a "*Set must be finite")) | |
| 1276 (let ((count 0)) | |
| 1277 (while (setq a (cdr a)) | |
| 1278 (if (eq (car-safe (car a)) 'intv) | |
| 1279 (setq count (math-add count (math-sub (nth 3 (car a)) | |
| 1280 (nth 2 (car a)))))) | |
| 1281 (setq count (math-add count 1))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1282 count)) |
| 40785 | 1283 |
| 1284 (defun calcFunc-venum (a) | |
| 1285 (setq a (calcFunc-vfloor a t)) | |
| 1286 (or (math-constp a) (math-reject-arg a "*Set must be finite")) | |
| 1287 (let ((p a) next) | |
| 1288 (while (cdr p) | |
| 1289 (setq next (cdr p)) | |
| 1290 (if (eq (car-safe (nth 1 p)) 'intv) | |
| 1291 (setcdr p (nconc (cdr (calcFunc-index (math-add | |
| 1292 (math-sub (nth 3 (nth 1 p)) | |
| 1293 (nth 2 (nth 1 p))) | |
| 1294 1) | |
| 1295 (nth 2 (nth 1 p)))) | |
| 1296 (cdr (cdr p))))) | |
| 1297 (setq p next)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1298 a)) |
| 40785 | 1299 |
| 1300 (defun calcFunc-vpack (a) | |
| 1301 (setq a (calcFunc-vfloor a t)) | |
| 1302 (if (and (cdr a) | |
| 1303 (math-negp (if (eq (car-safe (nth 1 a)) 'intv) | |
| 1304 (nth 2 (nth 1 a)) | |
| 1305 (nth 1 a)))) | |
| 1306 (math-reject-arg (nth 1 a) 'posp)) | |
| 1307 (let ((accum 0)) | |
| 1308 (while (setq a (cdr a)) | |
| 1309 (if (eq (car-safe (car a)) 'intv) | |
| 1310 (if (equal (nth 3 (car a)) '(var inf var-inf)) | |
| 1311 (setq accum (math-sub accum | |
| 1312 (math-power-of-2 (nth 2 (car a))))) | |
| 1313 (setq accum (math-add accum | |
| 1314 (math-sub | |
| 1315 (math-power-of-2 (1+ (nth 3 (car a)))) | |
| 1316 (math-power-of-2 (nth 2 (car a))))))) | |
| 1317 (setq accum (math-add accum (math-power-of-2 (car a)))))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1318 accum)) |
| 40785 | 1319 |
| 1320 (defun calcFunc-vunpack (a &optional w) | |
| 1321 (or (math-num-integerp a) (math-reject-arg a 'integerp)) | |
| 1322 (if w (setq a (math-clip a w))) | |
| 1323 (if (math-messy-integerp a) (setq a (math-trunc a))) | |
| 1324 (let* ((calc-number-radix 2) | |
| 1325 (neg (math-negp a)) | |
| 1326 (aa (if neg (math-sub -1 a) a)) | |
| 1327 (str (if (eq aa 0) | |
| 1328 "" | |
| 1329 (if (consp aa) | |
| 1330 (math-format-bignum-binary (cdr aa)) | |
| 1331 (math-format-binary aa)))) | |
| 1332 (zero (if neg ?1 ?0)) | |
| 1333 (one (if neg ?0 ?1)) | |
| 1334 (len (length str)) | |
| 1335 (vec (list 'vec)) | |
| 1336 (pos (1- len)) pos2) | |
| 1337 (while (>= pos 0) | |
| 1338 (if (eq (aref str pos) zero) | |
| 1339 (setq pos (1- pos)) | |
| 1340 (setq pos2 pos) | |
| 1341 (while (and (>= pos 0) (eq (aref str pos) one)) | |
| 1342 (setq pos (1- pos))) | |
| 1343 (setq vec (cons (if (= pos (1- pos2)) | |
| 1344 (- len pos2 1) | |
| 1345 (list 'intv 3 (- len pos2 1) (- len pos 2))) | |
| 1346 vec)))) | |
| 1347 (if neg | |
| 1348 (setq vec (cons (list 'intv 2 len '(var inf var-inf)) vec))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1349 (math-clean-set (nreverse vec)))) |
| 40785 | 1350 |
| 1351 (defun calcFunc-rdup (a) | |
| 1352 (if (math-simple-set a) | |
| 1353 (progn | |
| 1354 (and (Math-objectp a) (setq a (list 'vec a))) | |
| 1355 (or (math-vectorp a) (math-reject-arg a 'vectorp)) | |
| 1356 (setq a (sort (copy-sequence (cdr a)) 'math-beforep)) | |
| 1357 (let ((p a)) | |
| 1358 (while (cdr p) | |
| 1359 (if (Math-equal (car p) (nth 1 p)) | |
| 1360 (setcdr p (cdr (cdr p))) | |
| 1361 (setq p (cdr p))))) | |
| 1362 (cons 'vec a)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1363 (math-clean-set (math-prepare-set a)))) |
| 40785 | 1364 |
| 1365 (defun math-prepare-set (a) | |
| 1366 (if (Math-objectp a) | |
| 1367 (setq a (list 'vec a)) | |
| 1368 (or (math-vectorp a) (math-reject-arg a 'vectorp)) | |
| 1369 (setq a (cons 'vec (sort (copy-sequence (cdr a)) 'math-beforep)))) | |
| 1370 (let ((p a) res) | |
| 1371 | |
| 1372 ;; Convert all elements to non-empty intervals. | |
| 1373 (while (cdr p) | |
| 1374 (if (eq (car-safe (nth 1 p)) 'intv) | |
| 1375 (if (math-intv-constp (nth 1 p)) | |
| 1376 (if (and (memq (nth 1 (nth 1 p)) '(0 1 2)) | |
| 1377 (Math-equal (nth 2 (nth 1 p)) (nth 3 (nth 1 p)))) | |
| 1378 (setcdr p (cdr (cdr p))) | |
| 1379 (setq p (cdr p))) | |
| 1380 (math-reject-arg (nth 1 p) 'constp)) | |
| 1381 (or (Math-anglep (nth 1 p)) | |
| 1382 (eq (car (nth 1 p)) 'date) | |
| 1383 (equal (nth 1 p) '(var inf var-inf)) | |
| 1384 (equal (nth 1 p) '(neg (var inf var-inf))) | |
| 1385 (math-reject-arg (nth 1 p) 'realp)) | |
| 1386 (setcar (cdr p) (list 'intv 3 (nth 1 p) (nth 1 p))) | |
| 1387 (setq p (cdr p)))) | |
| 1388 | |
| 1389 ;; Combine redundant intervals. | |
| 1390 (setq p a) | |
| 1391 (while (cdr (cdr p)) | |
| 1392 (if (or (memq (setq res (math-compare (nth 3 (nth 1 p)) | |
| 1393 (nth 2 (nth 2 p)))) | |
| 1394 '(-1 2)) | |
| 1395 (and (eq res 0) | |
| 1396 (memq (nth 1 (nth 1 p)) '(0 2)) | |
| 1397 (memq (nth 1 (nth 2 p)) '(0 1)))) | |
| 1398 (setq p (cdr p)) | |
| 1399 (setq res (math-compare (nth 3 (nth 1 p)) (nth 3 (nth 2 p)))) | |
| 1400 (setcdr p (cons (list 'intv | |
| 1401 (+ (logand (logior (nth 1 (nth 1 p)) | |
| 1402 (if (Math-equal | |
| 1403 (nth 2 (nth 1 p)) | |
| 1404 (nth 2 (nth 2 p))) | |
| 1405 (nth 1 (nth 2 p)) | |
| 1406 0)) | |
| 1407 2) | |
| 1408 (logand (logior (if (memq res '(1 0 2)) | |
| 1409 (nth 1 (nth 1 p)) 0) | |
| 1410 (if (memq res '(-1 0 2)) | |
| 1411 (nth 1 (nth 2 p)) 0)) | |
| 1412 1)) | |
| 1413 (nth 2 (nth 1 p)) | |
| 1414 (if (eq res 1) | |
| 1415 (nth 3 (nth 1 p)) | |
| 1416 (nth 3 (nth 2 p)))) | |
| 1417 (cdr (cdr (cdr p)))))))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1418 a) |
| 40785 | 1419 |
| 1420 (defun math-clean-set (a &optional always-vec) | |
| 1421 (let ((p a) res) | |
| 1422 (while (cdr p) | |
| 1423 (if (and (eq (car-safe (nth 1 p)) 'intv) | |
| 1424 (Math-equal (nth 2 (nth 1 p)) (nth 3 (nth 1 p)))) | |
| 1425 (setcar (cdr p) (nth 2 (nth 1 p)))) | |
| 1426 (setq p (cdr p))) | |
| 1427 (if (and (not (cdr (cdr a))) | |
| 1428 (eq (car-safe (nth 1 a)) 'intv) | |
| 1429 (not always-vec)) | |
| 1430 (nth 1 a) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1431 a))) |
| 40785 | 1432 |
| 1433 (defun math-simple-set (a) | |
| 1434 (or (and (Math-objectp a) | |
| 1435 (not (eq (car-safe a) 'intv))) | |
| 1436 (and (Math-vectorp a) | |
| 1437 (progn | |
| 1438 (while (and (setq a (cdr a)) | |
| 1439 (not (eq (car-safe (car a)) 'intv)))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1440 (null a))))) |
| 40785 | 1441 |
| 1442 | |
| 1443 | |
| 1444 | |
| 1445 ;;; Compute a right-handed vector cross product. [O O O] [Public] | |
| 1446 (defun calcFunc-cross (a b) | |
| 1447 (if (and (eq (car-safe a) 'vec) | |
| 1448 (= (length a) 4)) | |
| 1449 (if (and (eq (car-safe b) 'vec) | |
| 1450 (= (length b) 4)) | |
| 1451 (list 'vec | |
| 1452 (math-sub (math-mul (nth 2 a) (nth 3 b)) | |
| 1453 (math-mul (nth 3 a) (nth 2 b))) | |
| 1454 (math-sub (math-mul (nth 3 a) (nth 1 b)) | |
| 1455 (math-mul (nth 1 a) (nth 3 b))) | |
| 1456 (math-sub (math-mul (nth 1 a) (nth 2 b)) | |
| 1457 (math-mul (nth 2 a) (nth 1 b)))) | |
| 1458 (math-reject-arg b "*Three-vector expected")) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1459 (math-reject-arg a "*Three-vector expected"))) |
| 40785 | 1460 |
| 1461 | |
| 1462 | |
| 1463 | |
| 1464 | |
| 1465 (defun math-read-brackets (space-sep close) | |
| 1466 (and space-sep (setq space-sep (not (math-check-for-commas)))) | |
| 1467 (math-read-token) | |
| 1468 (while (eq exp-token 'space) | |
| 1469 (math-read-token)) | |
| 1470 (if (or (equal exp-data close) | |
| 1471 (eq exp-token 'end)) | |
| 1472 (progn | |
| 1473 (math-read-token) | |
| 1474 '(vec)) | |
| 1475 (let ((save-exp-pos exp-pos) | |
| 1476 (save-exp-old-pos exp-old-pos) | |
| 1477 (save-exp-token exp-token) | |
| 1478 (save-exp-data exp-data) | |
| 1479 (vals (let ((exp-keep-spaces space-sep)) | |
| 1480 (if (or (equal exp-data "\\dots") | |
| 1481 (equal exp-data "\\ldots")) | |
| 1482 '(vec (neg (var inf var-inf))) | |
| 1483 (catch 'syntax (math-read-vector)))))) | |
| 1484 (if (stringp vals) | |
| 1485 (if space-sep | |
| 1486 (let ((error-exp-pos exp-pos) | |
| 1487 (error-exp-old-pos exp-old-pos) | |
| 1488 vals2) | |
| 1489 (setq exp-pos save-exp-pos | |
| 1490 exp-old-pos save-exp-old-pos | |
| 1491 exp-token save-exp-token | |
| 1492 exp-data save-exp-data) | |
| 1493 (let ((exp-keep-spaces nil)) | |
| 1494 (setq vals2 (catch 'syntax (math-read-vector)))) | |
| 1495 (if (and (not (stringp vals2)) | |
| 1496 (or (assoc exp-data '(("\\ldots") ("\\dots") (";"))) | |
| 1497 (equal exp-data close) | |
| 1498 (eq exp-token 'end))) | |
| 1499 (setq space-sep nil | |
| 1500 vals vals2) | |
| 1501 (setq exp-pos error-exp-pos | |
| 1502 exp-old-pos error-exp-old-pos) | |
| 1503 (throw 'syntax vals))) | |
| 1504 (throw 'syntax vals))) | |
| 1505 (if (or (equal exp-data "\\dots") | |
| 1506 (equal exp-data "\\ldots")) | |
| 1507 (progn | |
| 1508 (math-read-token) | |
| 1509 (setq vals (if (> (length vals) 2) | |
| 1510 (cons 'calcFunc-mul (cdr vals)) (nth 1 vals))) | |
| 1511 (let ((exp2 (if (or (equal exp-data close) | |
| 1512 (equal exp-data ")") | |
| 1513 (eq exp-token 'end)) | |
| 1514 '(var inf var-inf) | |
| 1515 (math-read-expr-level 0)))) | |
| 1516 (setq vals | |
| 1517 (list 'intv | |
| 1518 (if (equal exp-data ")") 2 3) | |
| 1519 vals | |
| 1520 exp2))) | |
| 1521 (if (not (or (equal exp-data close) | |
| 1522 (equal exp-data ")") | |
| 1523 (eq exp-token 'end))) | |
| 1524 (throw 'syntax "Expected `]'"))) | |
| 1525 (if (equal exp-data ";") | |
| 1526 (let ((exp-keep-spaces space-sep)) | |
| 1527 (setq vals (cons 'vec (math-read-matrix (list vals)))))) | |
| 1528 (if (not (or (equal exp-data close) | |
| 1529 (eq exp-token 'end))) | |
| 1530 (throw 'syntax "Expected `]'"))) | |
| 1531 (or (eq exp-token 'end) | |
| 1532 (math-read-token)) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1533 vals))) |
| 40785 | 1534 |
| 1535 (defun math-check-for-commas (&optional balancing) | |
| 1536 (let ((count 0) | |
| 1537 (pos (1- exp-pos))) | |
| 1538 (while (and (>= count 0) | |
| 1539 (setq pos (string-match | |
| 1540 (if balancing "[],[{}()<>]" "[],[{}()]") | |
| 1541 exp-str (1+ pos))) | |
| 1542 (or (/= (aref exp-str pos) ?,) (> count 0) balancing)) | |
| 1543 (cond ((memq (aref exp-str pos) '(?\[ ?\{ ?\( ?\<)) | |
| 1544 (setq count (1+ count))) | |
| 1545 ((memq (aref exp-str pos) '(?\] ?\} ?\) ?\>)) | |
| 1546 (setq count (1- count))))) | |
| 1547 (if balancing | |
| 1548 pos | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1549 (and pos (= (aref exp-str pos) ?,))))) |
| 40785 | 1550 |
| 1551 (defun math-read-vector () | |
| 1552 (let* ((val (list (math-read-expr-level 0))) | |
| 1553 (last val)) | |
| 1554 (while (progn | |
| 1555 (while (eq exp-token 'space) | |
| 1556 (math-read-token)) | |
| 1557 (and (not (eq exp-token 'end)) | |
| 1558 (not (equal exp-data ";")) | |
| 1559 (not (equal exp-data close)) | |
| 1560 (not (equal exp-data "\\dots")) | |
| 1561 (not (equal exp-data "\\ldots")))) | |
| 1562 (if (equal exp-data ",") | |
| 1563 (math-read-token)) | |
| 1564 (while (eq exp-token 'space) | |
| 1565 (math-read-token)) | |
| 1566 (let ((rest (list (math-read-expr-level 0)))) | |
| 1567 (setcdr last rest) | |
| 1568 (setq last rest))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1569 (cons 'vec val))) |
| 40785 | 1570 |
| 1571 (defun math-read-matrix (mat) | |
| 1572 (while (equal exp-data ";") | |
| 1573 (math-read-token) | |
| 1574 (while (eq exp-token 'space) | |
| 1575 (math-read-token)) | |
| 1576 (setq mat (nconc mat (list (math-read-vector))))) | |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1577 mat) |
| 40785 | 1578 |
|
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
1579 ;;; calc-vec.el ends here |
