factor: trim using lists

[factor.git] / extra / project-euler / ave-time / ave-time.factor

diff --git a/extra/project-euler/ave-time/ave-time.factor b/extra/project-euler/ave-time/ave-time.factor
index 2a516513a56e703a5bdf3df1dbcaf6a73c7065eb..340c85d2af5158f7e565bcc17c166f41669ec39b 100644 (file)
--- a/extra/project-euler/ave-time/ave-time.factor
+++ b/extra/project-euler/ave-time/ave-time.factor
@@ -1,21 +1,16 @@
-! Copyright (c) 2007 Aaron Schaefer.
+! Copyright (c) 2007, 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: continuations fry io kernel make math math.functions math.parser
-    math.statistics memory tools.time ;
+USING: combinators.smart formatting io kernel math math.functions
+math.statistics memory sequences tools.time ;
 IN: project-euler.ave-time
 
-: collect-benchmarks ( quot n -- seq )
-    [
-        [ datastack ]
-        [ '[ _ gc benchmark , ] tuck '[ _ _ with-datastack drop ] ]
-        [ 1- ] tri* swap times call
-    ] { } make ;
-
-: nth-place ( x n -- y )
-    10 swap ^ [ * round ] keep / ;
+MACRO: collect-benchmarks ( quot n -- seq )
+    swap '[ _ [ [ [ _ nullary ] preserving ] gc benchmark 6 10^ / ] replicate ] ;
 
 : ave-time ( quot n -- )
-    [ collect-benchmarks ] keep swap
-    [ std 2 nth-place ] [ mean round ] bi [
-        # " ms ave run time - " % # " SD (" % # " trials)" %
-    ] "" make print flush ; inline
+    [
+        collect-benchmarks
+        [ mean round >integer ]
+        [ std ] bi
+    ] keep
+    "%d ms ave run time - %.2f SD (%d trials)\n" printf flush ; inline