aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorJay Belanger2010-05-16 23:16:29 -0500
committerJay Belanger2010-05-16 23:16:29 -0500
commit00681a3c86cde16a08be8ec7358942437cd857b3 (patch)
treef2776d1b3756fb2fa03c96c366d00341fc065ea0 /lisp
parent7ca1f3f981dda5dbbab0095ab7c8e560eaaeaad8 (diff)
downloademacs-00681a3c86cde16a08be8ec7358942437cd857b3.tar.gz
emacs-00681a3c86cde16a08be8ec7358942437cd857b3.zip
calc-vec.el (math-vector-avg): Put the vector elements in order
before computing the averages.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calc/calc-vec.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 23338834d63..f6d4ce0c884 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-05-17 Jay Belanger <jay.p.belanger@gmail.com>
2
3 * calc/calc-vec.el (math-vector-avg): Put the vector elements in
4 order before computing the averages.
5
12010-05-16 Jay Belanger <jay.p.belanger@gmail.com> 62010-05-16 Jay Belanger <jay.p.belanger@gmail.com>
2 7
3 * calc/calc-vec.el (calc-histogram): 8 * calc/calc-vec.el (calc-histogram):
diff --git a/lisp/calc/calc-vec.el b/lisp/calc/calc-vec.el
index 5f426942e2f..5b807a55491 100644
--- a/lisp/calc/calc-vec.el
+++ b/lisp/calc/calc-vec.el
@@ -1178,7 +1178,7 @@
1178;;; Replace a vector [a b c ...] with a vector of averages 1178;;; Replace a vector [a b c ...] with a vector of averages
1179;;; [(a+b)/2 (b+c)/2 ...] 1179;;; [(a+b)/2 (b+c)/2 ...]
1180(defun math-vector-avg (vec) 1180(defun math-vector-avg (vec)
1181 (let ((vp (cdr vec)) 1181 (let ((vp (sort (copy-sequence (cdr vec)) 'math-beforep))
1182 (res nil)) 1182 (res nil))
1183 (while (and vp (cdr vp)) 1183 (while (and vp (cdr vp))
1184 (setq res (cons (math-div (math-add (car vp) (cadr vp)) 2) res) 1184 (setq res (cons (math-div (math-add (car vp) (cadr vp)) 2) res)