steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

project-euler.ave-time: fix ave-time combinator to infer with new, stricter stack checking regime, and add unit tests

Slava Pestov 2009-11-09 00:54:59 -06:00
parent f13be0c468
commit 581cff3194
3 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extra/project-euler/ave-time/ave-time-docs.factor
View File

@ -9,14 +9,6 @@ HELP: collect-benchmarks
$nl $nl
"A nicer word for interactive use is " { $link ave-time } "." } ; "A nicer word for interactive use is " { $link ave-time } "." } ;
HELP: nth-place
{ $values { "x" float } { "n" integer } { "y" float } }
{ $description "Rounds a floating point number to " { $snippet "n" } " decimal places." }
{ $examples
"This word is useful for display purposes when showing 15 decimal places is not desired:"
{ $unchecked-example "3.141592653589793 3 nth-place number>string" "\"3.142\"" }
} ;
HELP: ave-time HELP: ave-time
{ $values { "quot" quotation } { "n" integer } } { $values { "quot" quotation } { "n" integer } }
{ $description "Runs a quotation " { $snippet "n" } " times, then prints the average run time and standard deviation." } { $description "Runs a quotation " { $snippet "n" } " times, then prints the average run time and standard deviation." }

5
extra/project-euler/ave-time/ave-time-tests.factor Normal file
View File

@ -0,0 +1,5 @@
IN: project-euler.ave-time.tests
USING: tools.test math arrays project-euler.ave-time ;
{ 0 3 } [ 1 2 [ + ] 10 collect-benchmarks ] must-infer-as
[ 1 2 t ] [ 1 2 [ + ] 10 collect-benchmarks array? ] unit-test

28
extra/project-euler/ave-time/ave-time.factor
View File

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