# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1471895004 0
# Node ID e21b181efc55c36e925cfafed9fd3edfff062721
# Parent  8e950d7312af822f355af6a459ebbff7b9190824
Clean up `averaging`

diff -r 8e950d7312af -r e21b181efc55 losh.lisp
--- a/losh.lisp	Sat Aug 20 21:03:44 2016 +0000
+++ b/losh.lisp	Mon Aug 22 19:43:24 2016 +0000
@@ -402,6 +402,7 @@
   ;; a pretty rare case
   #+sbcl
   (fill (sb-ext:array-storage-vector array) item)
+
   #-(or sbcl)
   (fill (make-array (array-total-size array)
           :adjustable nil
@@ -409,6 +410,7 @@
           :displaced-to array
           :element-type (array-element-type array))
         item)
+
   array)
 
 
@@ -552,19 +554,14 @@
 
   "
   (with-gensyms (count)
-    (let ((average (or var (gensym "average"))))
+    (let ((average (or var iterate::*result-var*)))
       `(progn
+        (for ,count :from 0)
         (for ,average
              :first ,expr
-             ;; continuously recompute the running average instead of keeping
-             ;; a running total to avoid bignums when possible
              :then (/ (+ (* ,average ,count)
                          ,expr)
-                      (1+ ,count)))
-        (for ,count :from 1)
-        ,(when (null var)
-           ;; todo handle this better
-           `(finally (return ,average)))))))
+                      (1+ ,count)))))))
 
 (defmacro-clause (TIMING time-type &optional
                   SINCE-START-INTO since-var