project-euler.ave-time: fix ave-time combinator to infer with new, stricter stack checking regime, and add unit tests
parent
f13be0c468
commit
581cff3194
|
|
@ -9,14 +9,6 @@ HELP: collect-benchmarks
|
|||
$nl
|
||||
"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
|
||||
{ $values { "quot" quotation } { "n" integer } }
|
||||
{ $description "Runs a quotation " { $snippet "n" } " times, then prints the average run time and standard deviation." }
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -1,24 +1,16 @@
|
|||
! 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 fry io kernel macros math
|
||||
math.functions math.statistics memory sequences tools.time ;
|
||||
IN: project-euler.ave-time
|
||||
|
||||
: nth-place ( x n -- y )
|
||||
10^ [ * round >integer ] keep /f ;
|
||||
|
||||
: collect-benchmarks ( quot n -- seq )
|
||||
[
|
||||
[ datastack ]
|
||||
[
|
||||
'[ _ gc benchmark 1000 / , ]
|
||||
[ '[ _ _ with-datastack drop ] ] keep swap
|
||||
]
|
||||
[ 1 - ] tri* swap times call
|
||||
] { } make ; inline
|
||||
MACRO: collect-benchmarks ( quot n -- seq )
|
||||
swap '[ _ [ [ [ _ nullary ] preserving ] gc benchmark 1000 / ] replicate ] ;
|
||||
|
||||
: ave-time ( quot n -- )
|
||||
[ collect-benchmarks ] keep swap
|
||||
[ std 2 nth-place ] [ mean round >integer ] 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
|
||||
|
|
|
|||
Loading…
Reference in New Issue